diff options
| -rw-r--r-- | .qmake.conf | 4 | ||||
| -rw-r--r-- | src/effects/plugins.qmltypes | 2 | ||||
| -rw-r--r-- | tests/auto/tst_qtgraphicaleffects.cpp | 4 |
3 files changed, 6 insertions, 4 deletions
diff --git a/.qmake.conf b/.qmake.conf index 543d0a8..f6895bb 100644 --- a/.qmake.conf +++ b/.qmake.conf @@ -1,3 +1,5 @@ load(qt_build_config) -MODULE_VERSION = 5.13.2 +DEFINES += QT_NO_FOREACH QT_NO_JAVA_STYLE_ITERATORS QT_NO_LINKED_LIST + +MODULE_VERSION = 5.14.0 diff --git a/src/effects/plugins.qmltypes b/src/effects/plugins.qmltypes index 7c2924c..4efab89 100644 --- a/src/effects/plugins.qmltypes +++ b/src/effects/plugins.qmltypes @@ -4,7 +4,7 @@ import QtQuick.tooling 1.2 // It is used for QML tooling purposes only. // // This file was auto-generated by: -// 'qmlplugindump -nonrelocatable QtGraphicalEffects 1.13' +// 'qmlplugindump -nonrelocatable QtGraphicalEffects 1.14' Module { dependencies: ["QtQuick 2.12", "QtQuick.Window 2.12"] 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"); } |