diff options
| author | Alexandru Croitor <alexandru.croitor@qt.io> | 2020-09-21 19:30:19 +0200 |
|---|---|---|
| committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2020-09-22 19:08:53 +0200 |
| commit | a3bd80c08cd046d892c666098093ec20fc9e1321 (patch) | |
| tree | 5016362fcda4c093c8cb3274adf4c6d6a7d22719 /tests/auto/corelib | |
| parent | 9959090da84ee8681126da5763365e3e2a746f7e (diff) | |
CMake: Regenerate projects
Clean up the state of the projects,
before changing the internal CMake API function names.
Task-number: QTBUG-86815
Change-Id: I90f1b21b8ae4439a4a293872c3bb728dab44a50d
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
Diffstat (limited to 'tests/auto/corelib')
5 files changed, 12 insertions, 10 deletions
diff --git a/tests/auto/corelib/global/CMakeLists.txt b/tests/auto/corelib/global/CMakeLists.txt index 4dab15eaab..2aa86c533e 100644 --- a/tests/auto/corelib/global/CMakeLists.txt +++ b/tests/auto/corelib/global/CMakeLists.txt @@ -6,12 +6,12 @@ add_subdirectory(qgetputenv) add_subdirectory(qglobal) add_subdirectory(qnumeric) add_subdirectory(qfloat16) +add_subdirectory(qkeycombination) add_subdirectory(qrandomgenerator) add_subdirectory(qlogging) add_subdirectory(qtendian) add_subdirectory(qglobalstatic) add_subdirectory(qhooks) -add_subdirectory(qkeycombination) if(WIN32) add_subdirectory(qwinregistry) endif() diff --git a/tests/auto/corelib/io/qstandardpaths/CMakeLists.txt b/tests/auto/corelib/io/qstandardpaths/CMakeLists.txt index be03b3e986..74ec2cd855 100644 --- a/tests/auto/corelib/io/qstandardpaths/CMakeLists.txt +++ b/tests/auto/corelib/io/qstandardpaths/CMakeLists.txt @@ -10,10 +10,7 @@ list(APPEND test_data "qstandardpaths.pro") qt_add_test(tst_qstandardpaths SOURCES - ../../../../shared/emulationdetector.h tst_qstandardpaths.cpp - INCLUDE_DIRECTORIES - ../../../../shared TESTDATA ${test_data} ) diff --git a/tests/auto/corelib/kernel/qvariant/.prev_CMakeLists.txt b/tests/auto/corelib/kernel/qvariant/.prev_CMakeLists.txt index bdf2e2f461..9534e22368 100644 --- a/tests/auto/corelib/kernel/qvariant/.prev_CMakeLists.txt +++ b/tests/auto/corelib/kernel/qvariant/.prev_CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qvariant Test: ##################################################################### -add_qt_test(tst_qvariant +qt_add_test(tst_qvariant SOURCES tst_qvariant.cpp DEFINES @@ -13,6 +13,7 @@ add_qt_test(tst_qvariant ../../../other/qvariant_common PUBLIC_LIBRARIES Qt::CorePrivate + Qt::Gui ) # Resources: @@ -21,7 +22,7 @@ set(qvariant_resource_files "stream/qt5.0/" ) -add_qt_resource(tst_qvariant "qvariant" +qt_add_resource(tst_qvariant "qvariant" PREFIX "/" FILES @@ -32,7 +33,12 @@ add_qt_resource(tst_qvariant "qvariant" ## Scopes: ##################################################################### -extend_target(tst_qvariant CONDITION NOT QT_FEATURE_doubleconversion AND NOT QT_FEATURE_system_doubleconversion +qt_extend_target(tst_qvariant CONDITION MSVC + COMPILE_OPTIONS + /bigobj +) + +qt_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 7ac25bf3d5..9534e22368 100644 --- a/tests/auto/corelib/kernel/qvariant/CMakeLists.txt +++ b/tests/auto/corelib/kernel/qvariant/CMakeLists.txt @@ -33,7 +33,7 @@ qt_add_resource(tst_qvariant "qvariant" ## Scopes: ##################################################################### -qt_extend_target(tst_qmetatype CONDITION MSVC +qt_extend_target(tst_qvariant CONDITION MSVC COMPILE_OPTIONS /bigobj ) diff --git a/tests/auto/corelib/serialization/json/CMakeLists.txt b/tests/auto/corelib/serialization/json/CMakeLists.txt index 57cab16b3d..f2d0d9d54c 100644 --- a/tests/auto/corelib/serialization/json/CMakeLists.txt +++ b/tests/auto/corelib/serialization/json/CMakeLists.txt @@ -15,13 +15,12 @@ qt_add_test(tst_json ##################################################################### #### Keys ignored in scope 2:.:.:json.pro:NOT ANDROID: -# TESTDATA = "bom.json" "test.json" "test.bjson" "test3.json" "test2.json" +# TESTDATA = "bom.json" "test.json" "test3.json" "test2.json" if(ANDROID) # Resources: set(json_resource_files "bom.json" - "test.bjson" "test.json" "test2.json" "test3.json" |