aboutsummaryrefslogtreecommitdiffstats
path: root/src/qmltest
diff options
context:
space:
mode:
authorAnton Kudryavtsev <a.kudryavtsev@netris.ru>2016-08-11 17:28:55 +0300
committerAnton Kudryavtsev <a.kudryavtsev@netris.ru>2016-08-11 18:34:37 +0000
commitd39d23b9f2aab71c942954e68d92abfd19018e96 (patch)
tree56f10cae77437067815ae91149faad6218474109 /src/qmltest
parent125c4e2fd1cd1bc2d85f445d9a3feb2de98489e4 (diff)
QmlTest: replace 'foreach' with 'range for'
And add QT_NO_FOREACH define to .pro file. Now QmlTest is 'foreach' free. Change-Id: I17d8563cafd34bb90fe455ae955da5c56fbd2899 Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
Diffstat (limited to 'src/qmltest')
-rw-r--r--src/qmltest/qmltest.pro2
-rw-r--r--src/qmltest/quicktest.cpp13
2 files changed, 8 insertions, 7 deletions
diff --git a/src/qmltest/qmltest.pro b/src/qmltest/qmltest.pro
index ebbcbcd1eb..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
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;