diff options
Diffstat (limited to 'tests/auto/corelib/kernel')
-rw-r--r-- | tests/auto/corelib/kernel/qvariant/.prev_CMakeLists.txt | 12 | ||||
-rw-r--r-- | tests/auto/corelib/kernel/qvariant/CMakeLists.txt | 2 |
2 files changed, 10 insertions, 4 deletions
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 ) |