1 files changed, 2 insertions, 14 deletions
diff --git a/src/dbus/qdbusmetaobject.cpp b/src/dbus/qdbusmetaobject.cpp
index 9f07817df0..2d009ebfca 100644
--- a/src/dbus/qdbusmetaobject.cpp
+++ b/src/dbus/qdbusmetaobject.cpp
@@ -123,17 +123,6 @@ QDBusMetaObjectGenerator::QDBusMetaObjectGenerator(const QString &interfaceName,
 static int registerComplexDBusType(const char *typeName)
 {
     struct QDBusRawTypeHandler {
-        static void destroy(void *)
-        {
-            qFatal("Cannot destroy placeholder type QDBusRawType");
-        }
-
-        static void *create(const void *)
-        {
-            qFatal("Cannot create placeholder type QDBusRawType");
-            return 0;
-        }
-
         static void destruct(void *)
         {
             qFatal("Cannot destruct placeholder type QDBusRawType");
@@ -146,8 +135,7 @@ static int registerComplexDBusType(const char *typeName)
         }
     };
 
-    return QMetaType::registerNormalizedType(typeName, QDBusRawTypeHandler::destroy,
-                                             QDBusRawTypeHandler::create,
+    return QMetaType::registerNormalizedType(typeName,
                                              QDBusRawTypeHandler::destruct,
                                              QDBusRawTypeHandler::construct,
                                              sizeof(void *),
@@ -516,7 +504,7 @@ void QDBusMetaObjectGenerator::write(QDBusMetaObject *obj)
     }
 
     Q_ASSERT(offset == header->methodData + header->methodCount * 5);
-    Q_ASSERT(parametersOffset = header->propertyData);
+    Q_ASSERT(parametersOffset == header->propertyData);
     Q_ASSERT(signatureOffset == header->methodDBusData + header->methodCount * intsPerMethod);
     Q_ASSERT(typeidOffset == idata.size());
     offset += methodParametersDataSize;