From b41c44d966f518ae1497ac4d5bc02291cfd72541 Mon Sep 17 00:00:00 2001 From: Thiago Macieira Date: Mon, 6 Feb 2023 17:10:31 -0800 Subject: [PATCH] qdbusxml2cpp: don't emit Q_DECL_DEPRECATED for the adaptor The adaptor is a server-side implementation that must exist anyway and is called by the QtDBus runtime. We don't want warning on the server side because it must call those methods to implement the client API. Since we have the XML introspection saved in a class property anyway, the runtime won't be inspecting the method tags to see if Q_DECL_DEPRECATED is there, to add to the XML (which it isn't generating). Pick-to: 6.5 Change-Id: I9671dee8ceb64aa9b9cafffd17416596135d26ca Reviewed-by: David Faure --- src/tools/qdbusxml2cpp/qdbusxml2cpp.cpp | 9 +-------- tests/auto/tools/qdbusxml2cpp/tst_qdbusxml2cpp.cpp | 6 +++--- 2 files changed, 4 insertions(+), 11 deletions(-) diff --git a/src/tools/qdbusxml2cpp/qdbusxml2cpp.cpp b/src/tools/qdbusxml2cpp/qdbusxml2cpp.cpp index 873c133232..04233df1fe 100644 --- a/src/tools/qdbusxml2cpp/qdbusxml2cpp.cpp +++ b/src/tools/qdbusxml2cpp/qdbusxml2cpp.cpp @@ -947,9 +947,6 @@ static void writeAdaptor(const QString &filename, const QDBusIntrospection::Inte } hs << " "; - if (method.annotations.value("org.freedesktop.DBus.Deprecated"_L1) == "true"_L1) - hs << "Q_DECL_DEPRECATED "; - QByteArray returnType; if (isNoReply) { hs << "Q_NOREPLY void "; @@ -1043,11 +1040,7 @@ static void writeAdaptor(const QString &filename, const QDBusIntrospection::Inte hs << "Q_SIGNALS: // SIGNALS" << Qt::endl; for (const QDBusIntrospection::Signal &signal : interface->signals_) { - hs << " "; - if (signal.annotations.value("org.freedesktop.DBus.Deprecated"_L1) == "true"_L1) - hs << "Q_DECL_DEPRECATED "; - - hs << "void " << signal.name << "("; + hs << " void " << signal.name << "("; QStringList argNames = makeArgNames(signal.outputArgs); writeSignalArgList(hs, argNames, signal.annotations, signal.outputArgs); diff --git a/tests/auto/tools/qdbusxml2cpp/tst_qdbusxml2cpp.cpp b/tests/auto/tools/qdbusxml2cpp/tst_qdbusxml2cpp.cpp index 1dde91311a..cb07181c82 100644 --- a/tests/auto/tools/qdbusxml2cpp/tst_qdbusxml2cpp.cpp +++ b/tests/auto/tools/qdbusxml2cpp/tst_qdbusxml2cpp.cpp @@ -246,7 +246,7 @@ void tst_qdbusxml2cpp::process_data() "" << QRegularExpression("Q_SLOTS:.*Q_DECL_DEPRECATED inline QDBusPendingReply<> Method\\(\\)", QRegularExpression::DotMatchesEverythingOption) - << QRegularExpression("Q_SLOTS:.*void Method\\(\\)", + << QRegularExpression("Q_SLOTS:.*\n\\s*void Method\\(\\)", // no Q_DECL_DEPRECATED QRegularExpression::DotMatchesEverythingOption); QTest::newRow("method-deprecated-2out") @@ -258,7 +258,7 @@ void tst_qdbusxml2cpp::process_data() << QRegularExpression("Q_SLOTS:.*Q_DECL_DEPRECATED inline QDBusPendingReply Method\\(\\)" ".*Q_DECL_DEPRECATED inline QDBusReply Method\\(QString &\\w*\\)", QRegularExpression::DotMatchesEverythingOption) - << QRegularExpression("Q_SLOTS:.*QString Method\\(QString &", + << QRegularExpression("Q_SLOTS:.*\n\\s*QString Method\\(QString &", // no Q_DECL_DEPRECATED QRegularExpression::DotMatchesEverythingOption); QTest::newRow("method-noreply") @@ -308,7 +308,7 @@ void tst_qdbusxml2cpp::process_data() )" << QRegularExpression(R"(Q_SIGNALS:.*\bQ_DECL_DEPRECATED void Signal\(\))", QRegularExpression::DotMatchesEverythingOption) - << QRegularExpression(R"(Q_SIGNALS:.*\bvoid Signal\(\))", + << QRegularExpression(R"(Q_SIGNALS:.*\n\s*void Signal\(\))", // no Q_DECL_DEPRECATED QRegularExpression::DotMatchesEverythingOption); }