diff options
| -rw-r--r-- | .qmake.conf | 4 | ||||
| -rw-r--r-- | tests/auto/tiff/tst_qtiff.cpp | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/.qmake.conf b/.qmake.conf index 1ed62c5..f6895bb 100644 --- a/.qmake.conf +++ b/.qmake.conf @@ -1,3 +1,5 @@ load(qt_build_config) -MODULE_VERSION = 5.13.1 +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)); } |