diff options
| author | David Faure <david.faure@kdab.com> | 2021-08-22 11:02:32 +0200 |
|---|---|---|
| committer | David Faure <david.faure@kdab.com> | 2021-08-23 23:07:30 +0200 |
| commit | 7a5f8baa67a66d90f77b3970bb0f92183901c1aa (patch) | |
| tree | c47e757c33109714c928f186fd68391dfef7c65e /src/tools | |
| parent | f037357232c2157d942ad9a104543d087f8a043b (diff) | |
qdbusxml2cpp: don't generate an include for all of QtDBus+QtCore
This, however, has to wait for Qt 7 for compat reasons.
Change-Id: I84db4715bf2e9d080d1446d24f0996c78a875e63
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'src/tools')
| -rw-r--r-- | src/tools/qdbusxml2cpp/qdbusxml2cpp.cpp | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/src/tools/qdbusxml2cpp/qdbusxml2cpp.cpp b/src/tools/qdbusxml2cpp/qdbusxml2cpp.cpp index 5bd2ecf861..97fc26f633 100644 --- a/src/tools/qdbusxml2cpp/qdbusxml2cpp.cpp +++ b/src/tools/qdbusxml2cpp/qdbusxml2cpp.cpp @@ -467,8 +467,13 @@ static void writeProxy(const QString &filename, const QDBusIntrospection::Interf // include our stuff: hs << "#include <QtCore/QObject>" << Qt::endl - << includeList - << "#include <QtDBus/QtDBus>" << Qt::endl; + << includeList; +#if QT_VERSION < QT_VERSION_CHECK(7, 0, 0) + hs << "#include <QtDBus/QtDBus>" << Qt::endl; +#else + hs << "#include <QtDBus/QDBusAbstractInterface>" << Qt::endl; + hs << "#include <QtDBus/QDBusPendingReply>" << Qt::endl; +#endif for (const QString &include : qAsConst(includes)) { hs << "#include \"" << include << "\"" << Qt::endl; @@ -776,7 +781,12 @@ static void writeAdaptor(const QString &filename, const QDBusIntrospection::Inte if (cppName == headerName) hs << "#include <QtCore/QMetaObject>" << Qt::endl << "#include <QtCore/QVariant>" << Qt::endl; +#if QT_VERSION < QT_VERSION_CHECK(7, 0, 0) hs << "#include <QtDBus/QtDBus>" << Qt::endl; +#else + hs << "#include <QtDBus/QDBusAbstractAdaptor>" << Qt::endl; + hs << "#include <QtDBus/QDBusObjectPath>" << Qt::endl; +#endif for (const QString &include : qAsConst(includes)) { hs << "#include \"" << include << "\"" << Qt::endl; |