diff options
| author |   Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2020-01-28 01:00:39 +0100 |
|---|---|---|
| committer |   Liang Qi <liang.qi@qt.io> | 2020-01-28 14:17:01 +0000 |
| commit | ef442327b8a4122fe46462e95a0537ec5ac53cb6 (patch) | |
| tree | c0a0267ab4175d520a27c1dc7b589af220e77c48 /src/testlib/qtestlog.cpp | |
| parent | QProcess: remove deprecated signature of finished signal (diff) | |
| parent | Merge remote-tracking branch 'origin/5.15' into dev (diff) | |
| download | qtbase-ef442327b8a4122fe46462e95a0537ec5ac53cb6.tar.xz qtbase-ef442327b8a4122fe46462e95a0537ec5ac53cb6.zip | |
Merge "Merge remote-tracking branch 'origin/5.15' into dev"
Diffstat (limited to 'src/testlib/qtestlog.cpp')
| -rw-r--r-- | src/testlib/qtestlog.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/testlib/qtestlog.cpp b/src/testlib/qtestlog.cpp index f3ebf343c5..2776740784 100644 --- a/src/testlib/qtestlog.cpp +++ b/src/testlib/qtestlog.cpp @@ -152,7 +152,7 @@ namespace QTest { inline bool matches(QtMsgType tp, const QString &message) const { return tp == type - && (pattern.type() == QVariant::String ? + && (pattern.userType() == QMetaType::QString ? stringsMatch(pattern.toString(), message) : #if QT_CONFIG(regularexpression) pattern.toRegularExpression().match(message).hasMatch()); @@ -292,7 +292,7 @@ void QTestLog::printUnhandledIgnoreMessages() QString message; QTest::IgnoreResultList *list = QTest::ignoreResultList; while (list) { - if (list->pattern.type() == QVariant::String) { + if (list->pattern.userType() == QMetaType::QString) { message = QStringLiteral("Did not receive message: \"") + list->pattern.toString() + QLatin1Char('"'); } else { #if QT_CONFIG(regularexpression) |