# HG changeset patch
# User Eldar Insafutdinov
# Date 1300408263 0
# Node ID eb959324f82a101a9d60d815bbfef5c3fe908c7c
# Parent  778ef7374fb5e709efa0cc19e9b5fa5ac224f0c2# Parent  9d6e4703a458a18e9ef1acfcffa749ade332c476
merge

diff -r 778ef7374fb5 -r eb959324f82a d2/qtd/QMetaTypeImpl.d
--- a/d2/qtd/QMetaTypeImpl.d	Fri Mar 18 00:30:48 2011 +0000
+++ b/d2/qtd/QMetaTypeImpl.d	Fri Mar 18 00:31:03 2011 +0000
@@ -31,7 +31,7 @@
 {
     static void* construct(void* copy)
     {
-        auto T* p = cast(T*)GC.malloc(T.sizeof);
+        T* p = cast(T*)GC.malloc(T.sizeof);
         if (!p)
             onOutOfMemoryError();
 
diff -r 778ef7374fb5 -r eb959324f82a generator/typesystem_core-java.java
--- a/generator/typesystem_core-java.java	Fri Mar 18 00:30:48 2011 +0000
+++ b/generator/typesystem_core-java.java	Fri Mar 18 00:31:03 2011 +0000
@@ -145,6 +145,14 @@
     {
         QMetaObject.connectImpl(sender, signal, receiver, method, type);
     }
+
+    public final QVariant property(string name) {
+        return property(name is null? null : toStringz(name));
+    }
+
+    public final bool setProperty(string name, QVariant value) {
+        return setProperty(name is null? null : toStringz(name), value);
+    }
 }// class
 
 abstract class QAbstractItemModel___ extends QAbstractItemModel {