diff options
Diffstat (limited to 'src/qmltest')
| -rw-r--r-- | src/qmltest/qmltest.pro | 4 | ||||
| -rw-r--r-- | src/qmltest/quicktest.cpp | 13 | ||||
| -rw-r--r-- | src/qmltest/quicktestresult.cpp | 7 |
3 files changed, 15 insertions, 9 deletions
diff --git a/src/qmltest/qmltest.pro b/src/qmltest/qmltest.pro index 42224e9751..9852861334 100644 --- a/src/qmltest/qmltest.pro +++ b/src/qmltest/qmltest.pro @@ -1,6 +1,6 @@ TARGET = QtQuickTest -DEFINES += QT_NO_URL_CAST_FROM_STRING +DEFINES += QT_NO_URL_CAST_FROM_STRING QT_NO_FOREACH QT = core testlib-private QT_PRIVATE = quick qml-private gui core-private @@ -30,6 +30,6 @@ HEADERS += \ $$PWD/quicktestresult_p.h \ $$PWD/qtestoptions_p.h -DEFINES += QT_QML_DEBUG_NO_WARNING +!contains(QT_CONFIG, no-qml-debug): DEFINES += QT_QML_DEBUG_NO_WARNING load(qt_module) diff --git a/src/qmltest/quicktest.cpp b/src/qmltest/quicktest.cpp index bc26a19033..0e348eee11 100644 --- a/src/qmltest/quicktest.cpp +++ b/src/qmltest/quicktest.cpp @@ -144,7 +144,7 @@ void handleCompileErrors(const QFileInfo &fi, QQuickView *view) QTextStream str(&message); str << "\n " << QDir::toNativeSeparators(fi.absoluteFilePath()) << " produced " << errors.size() << " error(s):\n"; - foreach (const QQmlError &e, errors) { + for (const QQmlError &e : errors) { str << " "; if (e.url().isLocalFile()) { str << QDir::toNativeSeparators(e.url().toLocalFile()); @@ -158,11 +158,12 @@ void handleCompileErrors(const QFileInfo &fi, QQuickView *view) str << " Working directory: " << QDir::toNativeSeparators(QDir::current().absolutePath()) << '\n'; if (QQmlEngine *engine = view->engine()) { str << " View: " << view->metaObject()->className() << ", import paths:\n"; - foreach (const QString &i, engine->importPathList()) + const auto importPaths = engine->importPathList(); + for (const QString &i : importPaths) str << " '" << QDir::toNativeSeparators(i) << "'\n"; const QStringList pluginPaths = engine->pluginPathList(); str << " Plugin paths:\n"; - foreach (const QString &p, pluginPaths) + for (const QString &p : pluginPaths) str << " '" << QDir::toNativeSeparators(p) << "'\n"; } qWarning("%s", qPrintable(message)); @@ -338,11 +339,11 @@ int quick_test_main(int argc, char **argv, const char *name, const char *sourceD &eventLoop, SLOT(quit())); view->rootContext()->setContextProperty (QLatin1String("qtest"), QTestRootObject::instance()); // Deprecated. Use QTestRootObject from Qt.test.qtestroot instead - foreach (const QString &path, imports) + for (const QString &path : qAsConst(imports)) view->engine()->addImportPath(path); - foreach (const QString &path, pluginPaths) + for (const QString &path : qAsConst(pluginPaths)) view->engine()->addPluginPath(path); - foreach (const QString &file, files) { + for (const QString &file : qAsConst(files)) { const QFileInfo fi(file); if (!fi.exists()) continue; 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); |