1 files changed, 19 insertions, 7 deletions
diff --git a/tests/auto/tools/qdbusxml2cpp/tst_qdbusxml2cpp.cpp b/tests/auto/tools/qdbusxml2cpp/tst_qdbusxml2cpp.cpp
index 7d0c5d8d99..dbcec1d7b3 100644
--- a/tests/auto/tools/qdbusxml2cpp/tst_qdbusxml2cpp.cpp
+++ b/tests/auto/tools/qdbusxml2cpp/tst_qdbusxml2cpp.cpp
@@ -1,7 +1,7 @@
 /****************************************************************************
 **
 ** Copyright (C) 2012 Intel Corporation.
-** Contact: http://www.qt-project.org/legal
+** Contact: http://www.qt.io/licensing/
 **
 ** This file is part of the test suite of the Qt Toolkit.
 **
@@ -10,9 +10,9 @@
 ** Licensees holding valid commercial Qt licenses may use this file in
 ** accordance with the commercial license agreement provided with the
 ** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and Digia. For licensing terms and
-** conditions see http://qt.digia.com/licensing. For further information
-** use the contact form at http://qt.digia.com/contact-us.
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see http://www.qt.io/terms-conditions. For further
+** information use the contact form at http://www.qt.io/contact-us.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -23,8 +23,8 @@
 ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
 ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
-** In addition, as a special exception, Digia gives you certain additional
-** rights. These rights are described in the Digia Qt LGPL Exception
+** As a special exception, The Qt Company gives you certain additional
+** rights. These rights are described in The Qt Company LGPL Exception
 ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 ** $QT_END_LICENSE$
@@ -162,6 +162,16 @@ void tst_qdbusxml2cpp::process_data()
                                       .arg(basicTypeList[i].cppType), QRegularExpression::DotMatchesEverythingOption);
     }
 
+    QTest::newRow("method-name")
+        << "<method name=\"Method\">"
+            "<arg type=\"s\" direction=\"in\"/>"
+            "<annotation name=\"org.qtproject.QtDBus.MethodName\" value=\"MethodRenamed\" />"
+            "</method>"
+        << QRegularExpression("Q_SLOTS:.*QDBusPendingReply<> MethodRenamed\\(const QString &\\w*",
+                                QRegularExpression::DotMatchesEverythingOption)
+        << QRegularExpression("Q_SLOTS:.*void MethodRenamed\\(const QString &\\w*",
+                                QRegularExpression::DotMatchesEverythingOption);
+
     QTest::newRow("method-complex")
             << "<method name=\"Method\">"
                "<arg type=\"(dd)\" direction=\"in\"/>"
@@ -213,8 +223,10 @@ void tst_qdbusxml2cpp::process()
     QFETCH_GLOBAL(QString, commandLineArg);
 
     // Run the tool
+    const QString binpath = QLibraryInfo::location(QLibraryInfo::BinariesPath);
+    const QString command = binpath + QLatin1String("/qdbusxml2cpp");
     QProcess process;
-    process.start("qdbusxml2cpp", QStringList() << commandLineArg << "-" << "-N");
+    process.start(command, QStringList() << commandLineArg << "-" << "-N");
     QVERIFY2(process.waitForStarted(), qPrintable(process.errorString()));
 
     // feed it our XML data