diff options
| author | Alexandru Croitor <alexandru.croitor@qt.io> | 2020-03-11 19:09:45 +0100 |
|---|---|---|
| committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2020-03-12 11:41:39 +0100 |
| commit | 8facb31fde586acc1bdf6c74c198560833fe3dd8 (patch) | |
| tree | 8f7c93aa0978940d0241fd89addfea1c492491f1 /tests/auto/corelib/kernel | |
| parent | aa77fbca696ce4b107cd0bf866ac7676608f183b (diff) | |
CMake: Regenerate tests projects
Change-Id: I559bf2c82d83fac9bd3c52a331d99e1e83bc3f87
Reviewed-by: Leander Beernaert <leander.beernaert@qt.io>
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to 'tests/auto/corelib/kernel')
4 files changed, 10 insertions, 4 deletions
diff --git a/tests/auto/corelib/kernel/qmetatype/.prev_CMakeLists.txt b/tests/auto/corelib/kernel/qmetatype/.prev_CMakeLists.txt index 62d517c27d..9a0bbc189c 100644 --- a/tests/auto/corelib/kernel/qmetatype/.prev_CMakeLists.txt +++ b/tests/auto/corelib/kernel/qmetatype/.prev_CMakeLists.txt @@ -11,7 +11,6 @@ add_qt_test(tst_qmetatype SOURCES tst_qmetatype.cpp DEFINES - -QT_NO_LINKED_LIST QT_DISABLE_DEPRECATED_BEFORE=0 INCLUDE_DIRECTORIES ../../../other/qvariant_common diff --git a/tests/auto/corelib/kernel/qmetatype/CMakeLists.txt b/tests/auto/corelib/kernel/qmetatype/CMakeLists.txt index 3c9bb97825..9a0bbc189c 100644 --- a/tests/auto/corelib/kernel/qmetatype/CMakeLists.txt +++ b/tests/auto/corelib/kernel/qmetatype/CMakeLists.txt @@ -11,7 +11,6 @@ add_qt_test(tst_qmetatype SOURCES tst_qmetatype.cpp DEFINES - # -QT_NO_LINKED_LIST # special case remove until we fix this QT_DISABLE_DEPRECATED_BEFORE=0 INCLUDE_DIRECTORIES ../../../other/qvariant_common diff --git a/tests/auto/corelib/kernel/qvariant/.prev_CMakeLists.txt b/tests/auto/corelib/kernel/qvariant/.prev_CMakeLists.txt index dc676d11fe..bdf2e2f461 100644 --- a/tests/auto/corelib/kernel/qvariant/.prev_CMakeLists.txt +++ b/tests/auto/corelib/kernel/qvariant/.prev_CMakeLists.txt @@ -8,7 +8,6 @@ add_qt_test(tst_qvariant SOURCES tst_qvariant.cpp DEFINES - -QT_NO_LINKED_LIST QT_DISABLE_DEPRECATED_BEFORE=0 INCLUDE_DIRECTORIES ../../../other/qvariant_common @@ -32,3 +31,8 @@ add_qt_resource(tst_qvariant "qvariant" ## Scopes: ##################################################################### + +extend_target(tst_qvariant CONDITION NOT QT_FEATURE_doubleconversion AND NOT QT_FEATURE_system_doubleconversion + DEFINES + QT_NO_DOUBLECONVERSION +) diff --git a/tests/auto/corelib/kernel/qvariant/CMakeLists.txt b/tests/auto/corelib/kernel/qvariant/CMakeLists.txt index dff731cfc2..bdf2e2f461 100644 --- a/tests/auto/corelib/kernel/qvariant/CMakeLists.txt +++ b/tests/auto/corelib/kernel/qvariant/CMakeLists.txt @@ -8,7 +8,6 @@ add_qt_test(tst_qvariant SOURCES tst_qvariant.cpp DEFINES - # -QT_NO_LINKED_LIST # special case remove until we fix this QT_DISABLE_DEPRECATED_BEFORE=0 INCLUDE_DIRECTORIES ../../../other/qvariant_common @@ -32,3 +31,8 @@ add_qt_resource(tst_qvariant "qvariant" ## Scopes: ##################################################################### + +extend_target(tst_qvariant CONDITION NOT QT_FEATURE_doubleconversion AND NOT QT_FEATURE_system_doubleconversion + DEFINES + QT_NO_DOUBLECONVERSION +) |