diff options
| author | Fabian Kosmale <fabian.kosmale@qt.io> | 2023-03-14 08:29:43 +0000 |
|---|---|---|
| committer | Fabian Kosmale <fabian.kosmale@qt.io> | 2023-03-25 06:28:03 +0000 |
| commit | aea92807be2567c4212b96ae67de7137075ba4ee (patch) | |
| tree | 120f872c3f5e1fdde5a5a7a4a69b56dd12a14aee /src/tools/qdbusxml2cpp/qdbusxml2cpp.cpp | |
| parent | 22943b3a3f44fcf67da84f027d898ee9f2dfb666 (diff) | |
This reverts commit 310f6666150f18d40630b54cf5c9424e4cfb5567.
Reason for revert: Causes a fail-to-build regression
Task-number: QTBUG-111330
Change-Id: I08a6a68d2c81e1a1189356aa7cf36aaf24fd8c9b
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
Diffstat (limited to 'src/tools/qdbusxml2cpp/qdbusxml2cpp.cpp')
| -rw-r--r-- | src/tools/qdbusxml2cpp/qdbusxml2cpp.cpp | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/src/tools/qdbusxml2cpp/qdbusxml2cpp.cpp b/src/tools/qdbusxml2cpp/qdbusxml2cpp.cpp index 873c133232..0bfaf6eb1e 100644 --- a/src/tools/qdbusxml2cpp/qdbusxml2cpp.cpp +++ b/src/tools/qdbusxml2cpp/qdbusxml2cpp.cpp @@ -606,15 +606,13 @@ static void writeProxy(const QString &filename, const QDBusIntrospection::Interf continue; } - if (isDeprecated) - hs << " Q_DECL_DEPRECATED "; - else - hs << " "; + hs << " inline " + << (isDeprecated ? "Q_DECL_DEPRECATED " : ""); if (isNoReply) { - hs << "Q_NOREPLY inline void "; + hs << "Q_NOREPLY void "; } else { - hs << "inline QDBusPendingReply<"; + hs << "QDBusPendingReply<"; for (qsizetype i = 0; i < method.outputArgs.size(); ++i) hs << (i > 0 ? ", " : "") << templateArg(qtTypeName(method.outputArgs.at(i).name, method.outputArgs.at(i).type, @@ -650,7 +648,7 @@ static void writeProxy(const QString &filename, const QDBusIntrospection::Interf if (method.outputArgs.size() > 1) { // generate the old-form QDBusReply methods with multiple incoming parameters - hs << (isDeprecated ? " Q_DECL_DEPRECATED " : " ") << "inline QDBusReply<" + hs << " inline " << (isDeprecated ? "Q_DECL_DEPRECATED " : "") << "QDBusReply<" << templateArg(qtTypeName(method.outputArgs.first().name, method.outputArgs.first().type, method.annotations, 0, "Out")) << "> "; |