diff options
| author | Alexey Edelev <alexey.edelev@qt.io> | 2022-01-31 18:53:57 +0100 |
|---|---|---|
| committer | Alexey Edelev <alexey.edelev@qt.io> | 2022-02-02 16:45:37 +0100 |
| commit | fd3341a74ecbe93c5fb931f625075b93be69b9de (patch) | |
| tree | dd0df47448e832b524c91b945bfcc890607a9730 /tests/auto/corelib/tools | |
| parent | 1b34ee080e0b336233d2be8422c4476569251da6 (diff) | |
Add qt_internal_undefine_global_definition function
qt_internal_undefine_global_definition disables an internal global
definition that is defined by the qt_internal_add_global_definition
function for a specific target.
Remove the ability to set the custom "undefine" flag for the
definitions since it's hard to control it using the introduced
function.
Pick-to: 6.2 6.3
Task-number: QTBUG-100334
Change-Id: Ic1637d97aa51bbdd06c5b191c57a941aa208d4dc
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Diffstat (limited to 'tests/auto/corelib/tools')
| -rw-r--r-- | tests/auto/corelib/tools/collections/CMakeLists.txt | 3 | ||||
| -rw-r--r-- | tests/auto/corelib/tools/qhash/CMakeLists.txt | 3 | ||||
| -rw-r--r-- | tests/auto/corelib/tools/qmap/CMakeLists.txt | 3 | ||||
| -rw-r--r-- | tests/auto/corelib/tools/qset/CMakeLists.txt | 3 |
4 files changed, 4 insertions, 8 deletions
diff --git a/tests/auto/corelib/tools/collections/CMakeLists.txt b/tests/auto/corelib/tools/collections/CMakeLists.txt index 685d3761fb..a52bc6a772 100644 --- a/tests/auto/corelib/tools/collections/CMakeLists.txt +++ b/tests/auto/corelib/tools/collections/CMakeLists.txt @@ -9,5 +9,4 @@ qt_internal_add_test(tst_collections tst_collections.cpp ) -set_target_properties(tst_collections PROPERTIES - QT_INTERNAL_UNDEF_QT_NO_JAVA_STYLE_ITERATORS TRUE) +qt_internal_undefine_global_definition(tst_collections QT_NO_JAVA_STYLE_ITERATORS) diff --git a/tests/auto/corelib/tools/qhash/CMakeLists.txt b/tests/auto/corelib/tools/qhash/CMakeLists.txt index ba038c8f01..93535f2c66 100644 --- a/tests/auto/corelib/tools/qhash/CMakeLists.txt +++ b/tests/auto/corelib/tools/qhash/CMakeLists.txt @@ -9,5 +9,4 @@ qt_internal_add_test(tst_qhash tst_qhash.cpp ) -set_target_properties(tst_qhash PROPERTIES - QT_INTERNAL_UNDEF_QT_NO_JAVA_STYLE_ITERATORS TRUE) +qt_internal_undefine_global_definition(tst_qhash QT_NO_JAVA_STYLE_ITERATORS) diff --git a/tests/auto/corelib/tools/qmap/CMakeLists.txt b/tests/auto/corelib/tools/qmap/CMakeLists.txt index b5d36bf214..30c170e9fe 100644 --- a/tests/auto/corelib/tools/qmap/CMakeLists.txt +++ b/tests/auto/corelib/tools/qmap/CMakeLists.txt @@ -9,5 +9,4 @@ qt_internal_add_test(tst_qmap tst_qmap.cpp ) -set_target_properties(tst_qmap PROPERTIES - QT_INTERNAL_UNDEF_QT_NO_JAVA_STYLE_ITERATORS TRUE) +qt_internal_undefine_global_definition(tst_qmap QT_NO_JAVA_STYLE_ITERATORS) diff --git a/tests/auto/corelib/tools/qset/CMakeLists.txt b/tests/auto/corelib/tools/qset/CMakeLists.txt index f24d0da212..b56a0a210c 100644 --- a/tests/auto/corelib/tools/qset/CMakeLists.txt +++ b/tests/auto/corelib/tools/qset/CMakeLists.txt @@ -9,5 +9,4 @@ qt_internal_add_test(tst_qset tst_qset.cpp ) -set_target_properties(tst_qset PROPERTIES - QT_INTERNAL_UNDEF_QT_NO_JAVA_STYLE_ITERATORS TRUE) +qt_internal_undefine_global_definition(tst_qset QT_NO_JAVA_STYLE_ITERATORS) |