diff options
Diffstat (limited to 'src/qmltest/quicktestresult.cpp')
| -rw-r--r-- | src/qmltest/quicktestresult.cpp | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/qmltest/quicktestresult.cpp b/src/qmltest/quicktestresult.cpp index 0a820b79db..dd78b82dcb 100644 --- a/src/qmltest/quicktestresult.cpp +++ b/src/qmltest/quicktestresult.cpp @@ -46,6 +46,11 @@ #include <QtTest/private/qtestlog_p.h> #include "qtestoptions_p.h" #include <QtTest/qbenchmark.h> +// qbenchmark_p.h pulls windows.h via 3rd party; prevent it from defining +// the min/max macros which would clash with qnumeric_p.h's usage of min()/max(). +#if defined(Q_OS_WIN32) && !defined(NOMINMAX) +# define NOMINMAX +#endif #include <QtTest/private/qbenchmark_p.h> #include <QtCore/qset.h> #include <QtCore/qmap.h> @@ -248,7 +253,7 @@ void QuickTestResult::setDataTag(const QString &tag) if (!tag.isEmpty()) { QTestData *data = &(QTest::newRow(tag.toUtf8().constData())); QTestResult::setCurrentTestData(data); - QTestPrivate::checkBlackLists((testCaseName() + QStringLiteral("::") + functionName()).toUtf8().constData(), tag.toUtf8().constData()); + QTestPrivate::checkBlackLists((testCaseName() + QLatin1String("::") + functionName()).toUtf8().constData(), tag.toUtf8().constData()); emit dataTagChanged(); } else { QTestResult::setCurrentTestData(0); |