summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.qmake.conf2
-rw-r--r--tests/auto/tiff/tst_qtiff.cpp2
2 files changed, 3 insertions, 1 deletions
diff --git a/.qmake.conf b/.qmake.conf
index db2e0b6..f6895bb 100644
--- a/.qmake.conf
+++ b/.qmake.conf
@@ -1,3 +1,5 @@
load(qt_build_config)
+DEFINES += QT_NO_FOREACH QT_NO_JAVA_STYLE_ITERATORS QT_NO_LINKED_LIST
+
MODULE_VERSION = 5.14.0
diff --git a/tests/auto/tiff/tst_qtiff.cpp b/tests/auto/tiff/tst_qtiff.cpp
index b2c5546..a8a0ef2 100644
--- a/tests/auto/tiff/tst_qtiff.cpp
+++ b/tests/auto/tiff/tst_qtiff.cpp
@@ -499,7 +499,7 @@ void tst_qtiff::supportsOption()
allOptions.remove(QImageIOHandler::ImageOption(options.at(i)));
}
- foreach (QImageIOHandler::ImageOption option, allOptions)
+ for (QImageIOHandler::ImageOption option : qAsConst(allOptions))
QVERIFY(!writer.supportsOption(option));
}