From 439f343416a355d076b78ae22a989dd00ea6b268 Mon Sep 17 00:00:00 2001
From: Samuel Gaist <samuel.gaist@idiap.ch>
Date: Mon, 10 Jun 2019 09:17:06 +0200
Subject: [PATCH] test: migrate QDBusInterface test to QRegularExpression

This is part of the migration of qtbase from QRexExp to
QRegularExpression.

Task-number: QTBUG-72587
Change-Id: I47a047e27432c874b47bd25581806e1bc156e94f
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
---
 tests/auto/dbus/qdbusinterface/tst_qdbusinterface.cpp | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/tests/auto/dbus/qdbusinterface/tst_qdbusinterface.cpp b/tests/auto/dbus/qdbusinterface/tst_qdbusinterface.cpp
index 05480c6dd23..5453d9de61a 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>
@@ -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()