From 8bbb00e44e2f027c65ff2729f56353abc2b2cbef Mon Sep 17 00:00:00 2001 From: Kent Hansen Date: Fri, 3 Feb 2012 13:41:56 +0100 Subject: Adapt QtDBus to QVariant property type change Commit 00c8984b4e48b2a7eadfee6c3cd0cbb19f586118 changed other parts of Qt to use QMetaType::QVariant, not 0xff, as the type for QVariant properties. QtDBus should check for that type, and also use it for QDBusVariant properties. Change-Id: I21d81b59754ae44889766877a4c5066466b46d86 Reviewed-by: Thiago Macieira --- src/dbus/qdbusmetaobject.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/dbus/qdbusmetaobject.cpp') diff --git a/src/dbus/qdbusmetaobject.cpp b/src/dbus/qdbusmetaobject.cpp index a50100fad7..c83865978c 100644 --- a/src/dbus/qdbusmetaobject.cpp +++ b/src/dbus/qdbusmetaobject.cpp @@ -348,7 +348,7 @@ void QDBusMetaObjectGenerator::parseProperties() mp.flags |= Writable; if (mp.typeName == "QDBusVariant") - mp.flags |= 0xff << 24; + mp.flags |= QMetaType::QVariant << 24; else if (mp.type < 0xff) // encode the type in the flags mp.flags |= mp.type << 24; -- cgit v1.2.3