AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update dbus to use new QMetaType::registerNormalizedType signature

Browse Source 
Change-Id: I5d755f383d8cd226a25bd495f6854c0db9719a51
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
This commit is contained in:
Jędrzej Nowacki 2014-11-13 10:50:50 +01:00 committed by Jędrzej Nowacki
parent c5ecabb70c
commit 801c532636
1 changed files with 1 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/dbus/qdbusmetaobject.cpp
View File

@ -123,17 +123,6 @@ QDBusMetaObjectGenerator::QDBusMetaObjectGenerator(const QString &interfaceName,
static int registerComplexDBusType(const char *typeName) static int registerComplexDBusType(const char *typeName)
{ {
struct QDBusRawTypeHandler { 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 *) static void destruct(void *)
{ {
qFatal("Cannot destruct placeholder type QDBusRawType"); qFatal("Cannot destruct placeholder type QDBusRawType");
@ -146,8 +135,7 @@ static int registerComplexDBusType(const char *typeName)
} }
}; };
return QMetaType::registerNormalizedType(typeName, QDBusRawTypeHandler::destroy, return QMetaType::registerNormalizedType(typeName,
QDBusRawTypeHandler::create,
QDBusRawTypeHandler::destruct, QDBusRawTypeHandler::destruct,
QDBusRawTypeHandler::construct, QDBusRawTypeHandler::construct,
sizeof(void *), sizeof(void *),