diff options
Diffstat (limited to 'tests/auto/palette/CMakeLists.txt')
-rw-r--r-- | tests/auto/palette/CMakeLists.txt | 18 |
1 files changed, 7 insertions, 11 deletions
diff --git a/tests/auto/palette/CMakeLists.txt b/tests/auto/palette/CMakeLists.txt index e0ca9bb8..33f8b86b 100644 --- a/tests/auto/palette/CMakeLists.txt +++ b/tests/auto/palette/CMakeLists.txt @@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob data/*) list(APPEND test_data ${test_data_glob}) -add_qt_test(tst_palette +qt_add_test(tst_palette SOURCES ../shared/qtest_quickcontrols.h ../shared/util.cpp ../shared/util.h @@ -18,20 +18,16 @@ add_qt_test(tst_palette tst_palette.cpp DEFINES QQC2_IMPORT_PATH=\\\"${CMAKE_CURRENT_SOURCE_DIR}/../../../src/imports\\\" - LIBRARIES + PUBLIC_LIBRARIES Qt::CorePrivate + Qt::Gui Qt::GuiPrivate Qt::QmlPrivate + Qt::QuickControls2 Qt::QuickControls2Private Qt::QuickPrivate Qt::QuickTemplates2Private Qt::TestPrivate - PUBLIC_LIBRARIES - Qt::Gui - Qt::Qml - Qt::Quick - Qt::QuickControls2 - Qt::QuickTemplates2 TESTDATA ${test_data} ) @@ -40,7 +36,7 @@ set(qmake_immediate_resource_files "qtquickcontrols2.conf" ) -add_qt_resource(tst_palette "qmake_immediate" +qt_add_resource(tst_palette "qmake_immediate" PREFIX "/" FILES @@ -54,12 +50,12 @@ add_qt_resource(tst_palette "qmake_immediate" ## Scopes: ##################################################################### -extend_target(tst_palette CONDITION ANDROID OR APPLE_IOS +qt_extend_target(tst_palette CONDITION ANDROID OR IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" ) -extend_target(tst_palette CONDITION NOT ANDROID AND NOT APPLE_IOS +qt_extend_target(tst_palette CONDITION NOT ANDROID AND NOT IOS DEFINES QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" ) |