path: root/src/tools
diff options
authorKent Hansen <>2012-02-03 09:24:56 +0100
committerQt by Nokia <>2012-02-03 15:09:03 +0100
commit4ec2b37542b3202bb4dda50daf6af8b998bc0931 (patch)
treef44906caafe159f0752a1a21ec2799134a9cafa0 /src/tools
parent5117f55063af0df665c5eeabba26f4312bf5381b (diff)
Bring QtDBus meta-object generator in sync with moc
QtDBus's meta-object generator should generate objects of the same version as moc; in the future, when the moc version is bumped, QtDBus's meta-object generator has to be adapted at the same time. Since QMetaObjectPrivate and related flags reside in qmetaobject_p.h, QtDBus can just include the header instead of duplicating code. qmetaobject_p.h also defines the meta-object revision QtDBus should be targeting. QtDBus was generating version 3 meta-objects. This patch makes it generate version 6 (the current version). Since a new field was added to QMetaObjectPrivate in revision 4 (signalCount), the generator had to be adapted. In particular, the signal definitions need to come before other methods (as they do with moc), since there are functions in QObject that rely on that (e.g. computeOffsets()). Change-Id: I37f102d8c1be372ef6cfaf013baa87f9abb0fd5e Reviewed-by: Thiago Macieira <>
Diffstat (limited to 'src/tools')
0 files changed, 0 insertions, 0 deletions