diff options
| author | Alexey Edelev <alexey.edelev@qt.io> | 2021-01-22 14:06:49 +0100 |
|---|---|---|
| committer | Alexey Edelev <alexey.edelev@qt.io> | 2022-01-31 17:40:43 +0100 |
| commit | 1d28fd7a9c4720289f3d41db2ed8e6fcb07d5a30 (patch) | |
| tree | 0be203a249dbd46f2a518f2ded82a7a5950d81c1 /tests/auto/corelib/thread | |
| parent | f2f5c7d2b71a93ff826e3731cbb80febe5c7b308 (diff) | |
Restore missing Qt definitions
Restore the 'QT_NO_JAVA_STYLE_ITERATORS' and
'QT_NO_NARROWING_CONVERSIONS_IN_CONNECT' definitions for Qt
targets.
Add the function that adds global definitions for Qt targets according
to the provided scope and the target property-based switch to disable
the definition for a specific target.
Pick-to: 6.2 6.3
Task-number: QTBUG-100295
Change-Id: I28697e81f9aabc45c48d79aae1e5caea141e04e1
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Marc Mutz <marc.mutz@qt.io>
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to 'tests/auto/corelib/thread')
| -rw-r--r-- | tests/auto/corelib/thread/qfuture/CMakeLists.txt | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/tests/auto/corelib/thread/qfuture/CMakeLists.txt b/tests/auto/corelib/thread/qfuture/CMakeLists.txt index 7844cf31b9..0d0a2cb4bc 100644 --- a/tests/auto/corelib/thread/qfuture/CMakeLists.txt +++ b/tests/auto/corelib/thread/qfuture/CMakeLists.txt @@ -7,8 +7,6 @@ qt_internal_add_test(tst_qfuture SOURCES tst_qfuture.cpp -# DEFINES -# -QT_NO_JAVA_STYLE_ITERATORS PUBLIC_LIBRARIES Qt::CorePrivate ) @@ -17,3 +15,6 @@ qt_internal_extend_target(tst_qfuture CONDITION MSVC COMPILE_OPTIONS /bigobj ) + +set_target_properties(tst_qfuture PROPERTIES + QT_INTERNAL_UNDEF_QT_NO_JAVA_STYLE_ITERATORS TRUE) |