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); }