diff options
| author | Ievgenii Meshcheriakov <ievgenii.meshcheriakov@qt.io> | 2023-11-27 14:26:05 +0100 |
|---|---|---|
| committer | Ievgenii Meshcheriakov <ievgenii.meshcheriakov@qt.io> | 2023-11-28 13:37:56 +0100 |
| commit | 86cfafcb5ab66509ae7a3d422862611136ab2502 (patch) | |
| tree | 2180c7e8556c5806957fc1a4627ed0ab7333d553 /src/tools | |
| parent | b2d24044c2b001851b5aa88d92a0d5de57f25210 (diff) | |
qdbuscpp2xml: Register QtDBus metatypes
Explicitly register QtDBus-specific metatypes before attempting
to generate output. This fixes a bug when types like QDBusObjectPath
are sometimes ignored by this tool. Export QDBusMetaTypeId::init()
for that reason. Add a regression test to tst_qdbuscpp2xml.
Fixes: QTBUG-34550
Change-Id: I16faa79a794d09a26bad45e18730379681a20b50
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'src/tools')
| -rw-r--r-- | src/tools/qdbuscpp2xml/qdbuscpp2xml.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/tools/qdbuscpp2xml/qdbuscpp2xml.cpp b/src/tools/qdbuscpp2xml/qdbuscpp2xml.cpp index 7182e923f3..ac0c851cd6 100644 --- a/src/tools/qdbuscpp2xml/qdbuscpp2xml.cpp +++ b/src/tools/qdbuscpp2xml/qdbuscpp2xml.cpp @@ -15,6 +15,7 @@ #include <qdbusconnection.h> // for the Export* flags #include <private/qdbusconnection_p.h> // for the qDBusCheckAsyncTag +#include <private/qdbusmetatype_p.h> // for QDBusMetaTypeId::init() using namespace Qt::StringLiterals; @@ -431,6 +432,8 @@ int main(int argc, char **argv) args.append(QString::fromLocal8Bit(argv[n])); parseCmdLine(args); + QDBusMetaTypeId::init(); + QList<ClassDef> classes; if (args.isEmpty()) |