|
31 | 31 | #include <qcoreapplication.h>
|
32 | 32 | #include <qmetatype.h>
|
33 | 33 | #include <QtTest/QtTest>
|
| 34 | +#include <QtCore/qregularexpression.h> |
34 | 35 | #include <QtCore/qvariant.h>
|
35 | 36 | #include <QtDBus/QtDBus>
|
36 | 37 | #include <QtDBus/private/qdbus_symbols_p.h>
|
@@ -451,14 +452,16 @@ void tst_QDBusInterface::introspectVirtualObject()
|
451 | 452 | QDBusMessage message = QDBusMessage::createMethodCall(con.baseService(), path, "org.freedesktop.DBus.Introspectable", "Introspect");
|
452 | 453 | QDBusMessage reply = con.call(message, QDBus::Block, 5000);
|
453 | 454 | QVERIFY(reply.arguments().at(0).toString().contains(
|
454 |
| - QRegExp("<node>.*zitroneneis.*<interface name=") )); |
| 455 | + QRegularExpression("<node>.*zitroneneis.*<interface name=", |
| 456 | + QRegularExpression::DotMatchesEverythingOption))); |
455 | 457 |
|
456 | 458 | QDBusMessage message2 = QDBusMessage::createMethodCall(con.baseService(), path + "/foo", "org.freedesktop.DBus.Introspectable", "Introspect");
|
457 | 459 | QDBusMessage reply2 = con.call(message2, QDBus::Block, 5000);
|
458 | 460 | QVERIFY(reply2.arguments().at(0).toString().contains(
|
459 |
| - QRegExp("<node>.*<interface name=\"org.qtproject.QtDBus.VirtualObject\">" |
460 |
| - ".*<method name=\"klingeling\" />\n" |
461 |
| - ".*</interface>.*<interface name=") )); |
| 461 | + QRegularExpression("<node>.*<interface name=\"org.qtproject.QtDBus.VirtualObject\">" |
| 462 | + ".*<method name=\"klingeling\" />\n" |
| 463 | + ".*</interface>.*<interface name=", |
| 464 | + QRegularExpression::DotMatchesEverythingOption))); |
462 | 465 | }
|
463 | 466 |
|
464 | 467 | void tst_QDBusInterface::callMethod()
|
|
0 commit comments