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 /tests/auto/tools/qdbusxml2cpp/tst_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 'tests/auto/tools/qdbusxml2cpp/tst_qdbusxml2cpp.cpp')
| -rw-r--r-- | tests/auto/tools/qdbusxml2cpp/tst_qdbusxml2cpp.cpp | 49 |
1 files changed, 0 insertions, 49 deletions
diff --git a/tests/auto/tools/qdbusxml2cpp/tst_qdbusxml2cpp.cpp b/tests/auto/tools/qdbusxml2cpp/tst_qdbusxml2cpp.cpp index 1dde91311a..f75790da6e 100644 --- a/tests/auto/tools/qdbusxml2cpp/tst_qdbusxml2cpp.cpp +++ b/tests/auto/tools/qdbusxml2cpp/tst_qdbusxml2cpp.cpp @@ -240,46 +240,6 @@ void tst_qdbusxml2cpp::process_data() << QRegularExpression("Q_SLOTS:.*QString Method\\(const QString &\\w*, const QString &\\w*, QString &", QRegularExpression::DotMatchesEverythingOption); - QTest::newRow("method-deprecated-0out") - << "<method name=\"Method\">" - "<annotation name=\"org.freedesktop.DBus.Deprecated\" value=\"true\"/>" - "</method>" - << QRegularExpression("Q_SLOTS:.*Q_DECL_DEPRECATED inline QDBusPendingReply<> Method\\(\\)", - QRegularExpression::DotMatchesEverythingOption) - << QRegularExpression("Q_SLOTS:.*void Method\\(\\)", - QRegularExpression::DotMatchesEverythingOption); - - QTest::newRow("method-deprecated-2out") - << "<method name=\"Method\">" - "<annotation name=\"org.freedesktop.DBus.Deprecated\" value=\"true\"/>" - "<arg type=\"s\" direction=\"out\"/>" - "<arg type=\"s\" direction=\"out\"/>" - "</method>" - << QRegularExpression("Q_SLOTS:.*Q_DECL_DEPRECATED inline QDBusPendingReply<QString, QString> Method\\(\\)" - ".*Q_DECL_DEPRECATED inline QDBusReply<QString> Method\\(QString &\\w*\\)", - QRegularExpression::DotMatchesEverythingOption) - << QRegularExpression("Q_SLOTS:.*QString Method\\(QString &", - QRegularExpression::DotMatchesEverythingOption); - - QTest::newRow("method-noreply") - << "<method name=\"Method\">" - "<annotation name=\"org.freedesktop.DBus.Method.NoReply\" value=\"true\"/>" - "</method>" - << QRegularExpression("Q_SLOTS:.*Q_NOREPLY inline void Method\\(\\).*\\bQDBus::NoBlock\\b", - QRegularExpression::DotMatchesEverythingOption) - << QRegularExpression("Q_SLOTS:.*Q_NOREPLY void Method\\(", - QRegularExpression::DotMatchesEverythingOption); - - QTest::newRow("method-deprecated-noreply") - << "<method name=\"Method\">" - "<annotation name=\"org.freedesktop.DBus.Method.NoReply\" value=\"true\"/>" - "<annotation name=\"org.freedesktop.DBus.Deprecated\" value=\"true\"/>" - "</method>" - << QRegularExpression("Q_SLOTS:.*Q_DECL_DEPRECATED Q_NOREPLY inline void Method\\(\\).*\\bQDBus::NoBlock\\b", - QRegularExpression::DotMatchesEverythingOption) - << QRegularExpression("Q_SLOTS:.*Q_NOREPLY void Method\\(", - QRegularExpression::DotMatchesEverythingOption); - // -- signals -- for (int i = 0; i < basicTypeCount; ++i) { QRegularExpression rx(QString("Q_SIGNALS:.*\\bvoid Signal\\((const )?%1\\b") @@ -301,15 +261,6 @@ void tst_qdbusxml2cpp::process_data() <annotation name="org.qtproject.QtDBus.QtTypeName.Out0" value="QVariantMap"/>" </signal>)" << rx << rx; - - QTest::newRow("signal-deprecated") - << R"(<signal name="Signal"> - <annotation name="org.freedesktop.DBus.Deprecated" value="true"/> - </signal>)" - << QRegularExpression(R"(Q_SIGNALS:.*\bQ_DECL_DEPRECATED void Signal\(\))", - QRegularExpression::DotMatchesEverythingOption) - << QRegularExpression(R"(Q_SIGNALS:.*\bvoid Signal\(\))", - QRegularExpression::DotMatchesEverythingOption); } void tst_qdbusxml2cpp::process() |