diff options
| author | Marc Mutz <marc.mutz@qt.io> | 2026-03-24 15:51:04 +0100 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2026-03-27 00:38:51 +0000 |
| commit | d3e6de6b6ad91f4d920f5ea554203a6c60649463 (patch) | |
| tree | c6a3baaf02f37ffe8324e29d8ca6ee85f1e3a19f | |
| parent | 5497a9c8cf91ea66d170be401dee24bfa98fd1f7 (diff) | |
Remove per-library QT_NO_FOREACH
Since 8edbcdbeb49630c207f3111d24b9c9e07029e333, the whole module is
marked as QT_NO_FOREACH, with only individual TUs #undef'ing the macro
until they, too, are ported.
Amends said commit (6.7).
Pick-to: 6.8
Task-number: QTBUG-115808
Change-Id: Ifc72ced05b6e6d929e3eb0ac5211688839d88e0c
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
(cherry picked from commit bb6f2e742ee4d40e8ea8f58b7c9fc5e77400b4f9)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
(cherry picked from commit f59f6c8c7fcb09e2fa4cd869e35130ccbc034639)
| -rw-r--r-- | src/qml/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | src/qmlmodels/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | src/qmltest/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | src/qmlworkerscript/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | src/quick/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | src/quickwidgets/CMakeLists.txt | 1 |
6 files changed, 0 insertions, 6 deletions
diff --git a/src/qml/CMakeLists.txt b/src/qml/CMakeLists.txt index 7de517f523..e3534ef31e 100644 --- a/src/qml/CMakeLists.txt +++ b/src/qml/CMakeLists.txt @@ -387,7 +387,6 @@ qt_internal_add_qml_module(Qml ENABLE_JIT_CONSTANT_BLINDING=0 ENABLE_LLINT=0 JS_EXPORT_PRIVATE= # special case - QT_NO_FOREACH QT_NO_INTEGER_EVENT_COORDINATES QT_NO_URL_CAST_FROM_STRING WTFInvokeCrashHook=qmlWTFInvokeCrashHook diff --git a/src/qmlmodels/CMakeLists.txt b/src/qmlmodels/CMakeLists.txt index a06d3c9702..99aea4f297 100644 --- a/src/qmlmodels/CMakeLists.txt +++ b/src/qmlmodels/CMakeLists.txt @@ -18,7 +18,6 @@ qt_internal_add_qml_module(QmlModels qqmlmodelsmodule.cpp qqmlmodelsmodule_p.h qtqmlmodelsglobal.h qtqmlmodelsglobal_p.h DEFINES - QT_NO_FOREACH QT_NO_INTEGER_EVENT_COORDINATES QT_NO_URL_CAST_FROM_STRING LIBRARIES diff --git a/src/qmltest/CMakeLists.txt b/src/qmltest/CMakeLists.txt index fa20b51db2..908dd98a96 100644 --- a/src/qmltest/CMakeLists.txt +++ b/src/qmltest/CMakeLists.txt @@ -34,7 +34,6 @@ qt_internal_add_qml_module(QuickTest TestSchedule.qml testlogger.js DEFINES - QT_NO_FOREACH QT_NO_URL_CAST_FROM_STRING QT_BUILD_QMLTEST_LIB LIBRARIES diff --git a/src/qmlworkerscript/CMakeLists.txt b/src/qmlworkerscript/CMakeLists.txt index cb1643c6f5..8f2b8049c6 100644 --- a/src/qmlworkerscript/CMakeLists.txt +++ b/src/qmlworkerscript/CMakeLists.txt @@ -25,7 +25,6 @@ qt_internal_add_qml_module(QmlWorkerScript ENABLE_JIT_CONSTANT_BLINDING=0 ENABLE_LLINT=0 JS_EXPORT_PRIVATE= # special case - QT_NO_FOREACH QT_NO_INTEGER_EVENT_COORDINATES QT_NO_URL_CAST_FROM_STRING WTFInvokeCrashHook=qmlWTFInvokeCrashHook diff --git a/src/quick/CMakeLists.txt b/src/quick/CMakeLists.txt index bb0a4a6c0f..e807190ff3 100644 --- a/src/quick/CMakeLists.txt +++ b/src/quick/CMakeLists.txt @@ -229,7 +229,6 @@ qt_internal_add_qml_module(Quick util/qquickvalidator.cpp # expl. spec. of 'QMetaTypeId<QValidator *>' after inst. quick_qmltyperegistrations.cpp # qquickvalidator_p.h: error: explicit specialization of 'QMetaTypeId<QValidator *>' after instantiation DEFINES - QT_NO_FOREACH QT_NO_INTEGER_EVENT_COORDINATES QT_NO_URL_CAST_FROM_STRING INCLUDE_DIRECTORIES diff --git a/src/quickwidgets/CMakeLists.txt b/src/quickwidgets/CMakeLists.txt index f3575c84fc..a1aff7e247 100644 --- a/src/quickwidgets/CMakeLists.txt +++ b/src/quickwidgets/CMakeLists.txt @@ -12,7 +12,6 @@ qt_internal_add_module(QuickWidgets qquickwidget.cpp qquickwidget.h qquickwidget_p.h qtquickwidgetsglobal.h DEFINES - QT_NO_FOREACH QT_NO_INTEGER_EVENT_COORDINATES QT_NO_URL_CAST_FROM_STRING LIBRARIES |