summaryrefslogtreecommitdiffstats
path: root/src/dbus/qdbusmetaobject.cpp
diff options
context:
space:
mode:
authorKent Hansen <kent.hansen@nokia.com>2012-04-20 14:45:21 +0200
committerQt by Nokia <qt-info@nokia.com>2012-04-25 20:17:18 +0200
commit7b118c6456ba85a9f1c2fc0406d52829f1c8cdae (patch)
treeb84de98453751b63d1f77c707442fff334221f5e /src/dbus/qdbusmetaobject.cpp
parent28c79d8c0bbe7d4316c52f0f6f5421c9aa724735 (diff)
Split qobject_impl.h into qobjectdefs_impl.h
This is done to make QtPrivate::FunctionPointer available to the QMetaMethod declaration in qmetaobject.h (which already included qobjectdefs.h, since that's where QMetaObject is declared), so that the new template-based QMetaMethod::fromSignal() function may be implemented. The logic for statically generating the array of qMetaTypeId (used by the template-based QObject::connect()) remains in qobject_impl.h, since it's not needed for QMetaMethod::fromSignal(). Moreover, moving that code would introduce a circular dependency, since qmetatype.h as of commit 194674044693d6b101c3dc2f4784718540d343a4 now includes qobjectdefs.h. Change-Id: I36c35041e0c6661c3cf523684177a0b6c19e2d35 Reviewed-by: Olivier Goffart <ogoffart@woboq.com> Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com>
Diffstat (limited to 'src/dbus/qdbusmetaobject.cpp')
0 files changed, 0 insertions, 0 deletions