whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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>
bb10
David Faure 2021-08-22 11:02:32 +02:00
parent f037357232
commit 7a5f8baa67
1 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/tools/qdbusxml2cpp/qdbusxml2cpp.cpp
View File

@ -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;