diff options
Diffstat (limited to 'src/testlib/qtestlog.cpp')
| -rw-r--r-- | src/testlib/qtestlog.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/testlib/qtestlog.cpp b/src/testlib/qtestlog.cpp index f3ebf343c5..7e5f9182b8 100644 --- a/src/testlib/qtestlog.cpp +++ b/src/testlib/qtestlog.cpp @@ -44,7 +44,7 @@ #include <QtTest/private/qabstracttestlogger_p.h> #include <QtTest/private/qplaintestlogger_p.h> #include <QtTest/private/qcsvbenchmarklogger_p.h> -#include <QtTest/private/qxunittestlogger_p.h> +#include <QtTest/private/qjunittestlogger_p.h> #include <QtTest/private/qxmltestlogger_p.h> #include <QtTest/private/qteamcitylogger_p.h> #include <QtTest/private/qtaptestlogger_p.h> @@ -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) @@ -456,8 +456,8 @@ void QTestLog::addLogger(LogMode mode, const char *filename) case QTestLog::LightXML: logger = new QXmlTestLogger(QXmlTestLogger::Light, filename); break; - case QTestLog::XunitXML: - logger = new QXunitTestLogger(filename); + case QTestLog::JUnitXML: + logger = new QJUnitTestLogger(filename); break; case QTestLog::TeamCity: logger = new QTeamCityLogger(filename); |