Merge remote-tracking branch 'origin/5.8' into dev

Conflicts:
	.qmake.conf

Change-Id: I6c9ecff3a336c5183aa631e7ce600e99f9594dd5

1 files changed, 4 insertions, 4 deletions

diff --git a/tests/benchmarks/script/context2d/tst_context2d.cpp b/tests/benchmarks/script/context2d/tst_context2d.cpp
index f89a395..740eafc 100644
--- a/tests/benchmarks/script/context2d/tst_context2d.cpp
+++ b/tests/benchmarks/script/context2d/tst_context2d.cpp
@@ -104,8 +104,8 @@ void tst_Context2D::newEnvironment()
 void tst_Context2D::singleExecution_data()
 {
     QTest::addColumn<QString>("testName");
-    QFileInfoList testFileInfos = testsDir.entryInfoList(QStringList() << "*.js", QDir::Files);
-    foreach (QFileInfo tfi, testFileInfos) {
+    const QFileInfoList testFileInfos = testsDir.entryInfoList(QStringList() << "*.js", QDir::Files);
+    for (const QFileInfo &tfi : testFileInfos) {
         QString name = tfi.baseName();
         QTest::newRow(name.toLatin1().constData()) << name;
     }
@@ -136,8 +136,8 @@ void tst_Context2D::repeatedExecution_data()
     // us to observe potential effects of profiling-based JIT optimizations.
     QTest::addColumn<QString>("testName");
     QTest::addColumn<QString>("script");
-    QFileInfoList testFileInfos = testsDir.entryInfoList(QStringList() << "*.js", QDir::Files);
-    foreach (QFileInfo tfi, testFileInfos) {
+    const QFileInfoList testFileInfos = testsDir.entryInfoList(QStringList() << "*.js", QDir::Files);
+    for (const QFileInfo &tfi : testFileInfos) {
         QString script = readFile(tfi.absoluteFilePath());
         QString name = tfi.baseName();
         newEnvironment();