aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.qmake.conf2
-rw-r--r--tests/auto/tst_qtgraphicaleffects.cpp4
2 files changed, 4 insertions, 2 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/tst_qtgraphicaleffects.cpp b/tests/auto/tst_qtgraphicaleffects.cpp
index 7f26b01..1d7a633 100644
--- a/tests/auto/tst_qtgraphicaleffects.cpp
+++ b/tests/auto/tst_qtgraphicaleffects.cpp
@@ -78,9 +78,9 @@ QString tst_qtgraphicaleffects::componentErrors(const QQmlComponent* component)
QStringList out;
- foreach (QQmlError const& error, component->errors()) {
+ const auto errors = component->errors();
+ for (const QQmlError &error : errors)
out << error.toString();
- }
return out.join("\n");
}