1 files changed, 8 insertions, 5 deletions
diff --git a/tests/auto/dbus/qdbusinterface/tst_qdbusinterface.cpp b/tests/auto/dbus/qdbusinterface/tst_qdbusinterface.cpp
index 05480c6dd2..e416266b5f 100644
--- a/tests/auto/dbus/qdbusinterface/tst_qdbusinterface.cpp
+++ b/tests/auto/dbus/qdbusinterface/tst_qdbusinterface.cpp
@@ -31,6 +31,7 @@
 #include <qcoreapplication.h>
 #include <qmetatype.h>
 #include <QtTest/QtTest>
+#include <QtCore/qregularexpression.h>
 #include <QtCore/qvariant.h>
 #include <QtDBus/QtDBus>
 #include <QtDBus/private/qdbus_symbols_p.h>
@@ -270,7 +271,7 @@ void tst_QDBusInterface::initTestCase()
 #  define EXE ""
 #endif
     proc.setProcessChannelMode(QProcess::ForwardedErrorChannel);
-    proc.start(QFINDTESTDATA("qmyserver/qmyserver" EXE));
+    proc.start(QFINDTESTDATA("qmyserver/qmyserver_qdbusinterface" EXE)); // FIXME CMake: This is most probably wrong now since the binary ends up in bin/ not in the build tree
     QVERIFY2(proc.waitForStarted(), qPrintable(proc.errorString()));
     QVERIFY(proc.waitForReadyRead());
 
@@ -451,14 +452,16 @@ void tst_QDBusInterface::introspectVirtualObject()
     QDBusMessage message = QDBusMessage::createMethodCall(con.baseService(), path, "org.freedesktop.DBus.Introspectable", "Introspect");
     QDBusMessage reply = con.call(message, QDBus::Block, 5000);
     QVERIFY(reply.arguments().at(0).toString().contains(
-        QRegExp("<node>.*zitroneneis.*<interface name=") ));
+            QRegularExpression("<node>.*zitroneneis.*<interface name=",
+                               QRegularExpression::DotMatchesEverythingOption)));
 
     QDBusMessage message2 = QDBusMessage::createMethodCall(con.baseService(), path + "/foo", "org.freedesktop.DBus.Introspectable", "Introspect");
     QDBusMessage reply2 = con.call(message2, QDBus::Block, 5000);
     QVERIFY(reply2.arguments().at(0).toString().contains(
-        QRegExp("<node>.*<interface name=\"org.qtproject.QtDBus.VirtualObject\">"
-                ".*<method name=\"klingeling\" />\n"
-                ".*</interface>.*<interface name=") ));
+            QRegularExpression("<node>.*<interface name=\"org.qtproject.QtDBus.VirtualObject\">"
+                               ".*<method name=\"klingeling\" />\n"
+                               ".*</interface>.*<interface name=",
+                               QRegularExpression::DotMatchesEverythingOption)));
 }
 
 void tst_QDBusInterface::callMethod()