diff options
| author | Kent Hansen <kent.hansen@nokia.com> | 2012-02-18 22:14:36 +0100 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-02-29 12:50:14 +0100 |
| commit | 019a5f2dd50404abfb06f26d31aa6292eb6344fc (patch) | |
| tree | 9798b09da79f0807c0160b638e12a6b2a782295e /src/dbus/qdbusmetaobject_p.h | |
| parent | 87438fd705b2b81006a18f1c35ebd112da1b3054 (diff) | |
Port QDBusMetaObject to new meta-object string format
Bring QDBusMetaObject up-to-date with latest moc changes
(generating the string table as an array of QByteArrayData).
QDBusMetaObject now uses the same string table generator as
QMetaObjectBuilder.
The Q_CORE_EXPORT for rawStringData() will be removed once QtDBus
has been ported to the new meta-method data format (the method name
will be stored directly in the standard method descriptor, no need
for QtDBus to store it as a separate string).
Change-Id: I41165f48501b9b11c0288208cdc770926677a8aa
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'src/dbus/qdbusmetaobject_p.h')
| -rw-r--r-- | src/dbus/qdbusmetaobject_p.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/dbus/qdbusmetaobject_p.h b/src/dbus/qdbusmetaobject_p.h index 7a8de41fa0..23a7d53016 100644 --- a/src/dbus/qdbusmetaobject_p.h +++ b/src/dbus/qdbusmetaobject_p.h @@ -71,7 +71,7 @@ struct Q_DBUS_EXPORT QDBusMetaObject: public QMetaObject QDBusError &error); ~QDBusMetaObject() { - delete [] d.stringdata; + delete [] reinterpret_cast<const char *>(d.stringdata); delete [] d.data; } |