diff options
author | Mitch Curtis <mitch.curtis@qt.io> | 2020-08-11 11:57:24 +0200 |
---|---|---|
committer | Mitch Curtis <mitch.curtis@qt.io> | 2020-08-26 11:46:11 +0200 |
commit | 80c5d0841e6f7c0c9aedfdc01b5d060ab2f66b7d (patch) | |
tree | 8de7772b63706db7408debf30c4e3f5ab9425b31 /tests/auto | |
parent | b47e26d29db05ecf87f74815e37e0bf7394d06ba (diff) |
Fix CMake build
Task-number: QTBUG-82922
Change-Id: I75f4a553a6bb260f77bfa791f12fa42e80131e09
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
Diffstat (limited to 'tests/auto')
-rw-r--r-- | tests/auto/CMakeLists.txt | 2 | ||||
-rw-r--r-- | tests/auto/accessibility/CMakeLists.txt | 1 | ||||
-rw-r--r-- | tests/auto/cursor/CMakeLists.txt | 1 | ||||
-rw-r--r-- | tests/auto/customization/CMakeLists.txt | 1 | ||||
-rw-r--r-- | tests/auto/focus/CMakeLists.txt | 1 | ||||
-rw-r--r-- | tests/auto/qquickcontrol/CMakeLists.txt | 1 | ||||
-rw-r--r-- | tests/auto/qquickdrawer/CMakeLists.txt | 1 | ||||
-rw-r--r-- | tests/auto/qquickiconimage/CMakeLists.txt | 3 | ||||
-rw-r--r-- | tests/auto/qquickiconlabel/CMakeLists.txt | 3 | ||||
-rw-r--r-- | tests/auto/qquickmenu/CMakeLists.txt | 1 | ||||
-rw-r--r-- | tests/auto/qquickmenubar/CMakeLists.txt | 1 | ||||
-rw-r--r-- | tests/auto/qquickninepatchimage/CMakeLists.txt | 1 | ||||
-rw-r--r-- | tests/auto/qquickpopup/CMakeLists.txt | 1 | ||||
-rw-r--r-- | tests/auto/qquickstyle/CMakeLists.txt | 61 | ||||
-rw-r--r-- | tests/auto/sanity/CMakeLists.txt | 1 | ||||
-rw-r--r-- | tests/auto/snippets/CMakeLists.txt | 1 | ||||
-rw-r--r-- | tests/auto/styleimports/CMakeLists.txt | 62 | ||||
-rw-r--r-- | tests/auto/translation/CMakeLists.txt | 1 |
18 files changed, 88 insertions, 56 deletions
diff --git a/tests/auto/CMakeLists.txt b/tests/auto/CMakeLists.txt index 31d13ca7..68aba613 100644 --- a/tests/auto/CMakeLists.txt +++ b/tests/auto/CMakeLists.txt @@ -24,10 +24,10 @@ add_subdirectory(qquickmenubar) add_subdirectory(qquickninepatchimage) add_subdirectory(qquickpopup) add_subdirectory(qquickstyle) -add_subdirectory(qquickstyleselector) add_subdirectory(qquickuniversalstyle) add_subdirectory(qquickuniversalstyleconf) add_subdirectory(revisions) add_subdirectory(sanity) add_subdirectory(snippets) +add_subdirectory(styleimports) add_subdirectory(translation) diff --git a/tests/auto/accessibility/CMakeLists.txt b/tests/auto/accessibility/CMakeLists.txt index 9a8fa784..4ba2c566 100644 --- a/tests/auto/accessibility/CMakeLists.txt +++ b/tests/auto/accessibility/CMakeLists.txt @@ -28,6 +28,7 @@ qt_add_test(tst_accessibility Qt::GuiPrivate Qt::QmlPrivate Qt::QuickControls2 + Qt::QuickControls2Private Qt::QuickPrivate Qt::QuickTemplates2Private Qt::TestPrivate diff --git a/tests/auto/cursor/CMakeLists.txt b/tests/auto/cursor/CMakeLists.txt index 8034a11a..07d8a5f3 100644 --- a/tests/auto/cursor/CMakeLists.txt +++ b/tests/auto/cursor/CMakeLists.txt @@ -24,6 +24,7 @@ qt_add_test(tst_cursor Qt::GuiPrivate Qt::QmlPrivate Qt::QuickControls2 + Qt::QuickControls2Private Qt::QuickPrivate Qt::QuickTemplates2Private Qt::TestPrivate diff --git a/tests/auto/customization/CMakeLists.txt b/tests/auto/customization/CMakeLists.txt index 40e916a8..0ec56d9d 100644 --- a/tests/auto/customization/CMakeLists.txt +++ b/tests/auto/customization/CMakeLists.txt @@ -24,6 +24,7 @@ qt_add_test(tst_customization Qt::GuiPrivate Qt::QmlPrivate Qt::QuickControls2 + Qt::QuickControls2Private Qt::QuickPrivate Qt::QuickTemplates2Private Qt::TestPrivate diff --git a/tests/auto/focus/CMakeLists.txt b/tests/auto/focus/CMakeLists.txt index 1cc44de4..3e8234e9 100644 --- a/tests/auto/focus/CMakeLists.txt +++ b/tests/auto/focus/CMakeLists.txt @@ -24,6 +24,7 @@ qt_add_test(tst_focus Qt::GuiPrivate Qt::QmlPrivate Qt::QuickControls2 + Qt::QuickControls2Private Qt::QuickPrivate Qt::QuickTemplates2Private Qt::TestPrivate diff --git a/tests/auto/qquickcontrol/CMakeLists.txt b/tests/auto/qquickcontrol/CMakeLists.txt index 59e1ccb6..0599ce32 100644 --- a/tests/auto/qquickcontrol/CMakeLists.txt +++ b/tests/auto/qquickcontrol/CMakeLists.txt @@ -24,6 +24,7 @@ qt_add_test(tst_qquickcontrol Qt::GuiPrivate Qt::QmlPrivate Qt::QuickControls2 + Qt::QuickControls2Private Qt::QuickPrivate Qt::QuickTemplates2Private Qt::TestPrivate diff --git a/tests/auto/qquickdrawer/CMakeLists.txt b/tests/auto/qquickdrawer/CMakeLists.txt index 3679471a..e428a86c 100644 --- a/tests/auto/qquickdrawer/CMakeLists.txt +++ b/tests/auto/qquickdrawer/CMakeLists.txt @@ -24,6 +24,7 @@ qt_add_test(tst_qquickdrawer Qt::GuiPrivate Qt::QmlPrivate Qt::QuickControls2 + Qt::QuickControls2Private Qt::QuickPrivate Qt::QuickTemplates2Private Qt::TestPrivate diff --git a/tests/auto/qquickiconimage/CMakeLists.txt b/tests/auto/qquickiconimage/CMakeLists.txt index 9f6d0494..2ee0d295 100644 --- a/tests/auto/qquickiconimage/CMakeLists.txt +++ b/tests/auto/qquickiconimage/CMakeLists.txt @@ -23,7 +23,7 @@ qt_add_test(tst_qquickiconimage DEFINES QQC2_IMPORT_PATH=\\\"${CMAKE_CURRENT_SOURCE_DIR}/../../../src/imports\\\" LIBRARIES - Qt::QuickControls2Private + Qt::QuickControls2ImplPrivate Qt::QuickPrivate PUBLIC_LIBRARIES Qt::CorePrivate @@ -33,6 +33,7 @@ qt_add_test(tst_qquickiconimage Qt::QmlPrivate Qt::Quick Qt::QuickControls2 + Qt::QuickControls2Private Qt::QuickPrivate Qt::QuickTemplates2Private Qt::TestPrivate diff --git a/tests/auto/qquickiconlabel/CMakeLists.txt b/tests/auto/qquickiconlabel/CMakeLists.txt index bdbefd9d..97e115a5 100644 --- a/tests/auto/qquickiconlabel/CMakeLists.txt +++ b/tests/auto/qquickiconlabel/CMakeLists.txt @@ -19,7 +19,7 @@ qt_add_test(tst_qquickiconlabel DEFINES QQC2_IMPORT_PATH=\\\"${CMAKE_CURRENT_SOURCE_DIR}/../../../src/imports\\\" LIBRARIES - Qt::QuickControls2Private + Qt::QuickControls2ImplPrivate Qt::QuickPrivate PUBLIC_LIBRARIES Qt::CorePrivate @@ -29,6 +29,7 @@ qt_add_test(tst_qquickiconlabel Qt::QmlPrivate Qt::Quick Qt::QuickControls2 + Qt::QuickControls2Private Qt::QuickPrivate Qt::QuickTemplates2Private Qt::TestPrivate diff --git a/tests/auto/qquickmenu/CMakeLists.txt b/tests/auto/qquickmenu/CMakeLists.txt index 478aaa82..5d6b9ffa 100644 --- a/tests/auto/qquickmenu/CMakeLists.txt +++ b/tests/auto/qquickmenu/CMakeLists.txt @@ -24,6 +24,7 @@ qt_add_test(tst_qquickmenu Qt::GuiPrivate Qt::QmlPrivate Qt::QuickControls2 + Qt::QuickControls2Private Qt::QuickPrivate Qt::QuickTemplates2Private Qt::TestPrivate diff --git a/tests/auto/qquickmenubar/CMakeLists.txt b/tests/auto/qquickmenubar/CMakeLists.txt index 0803b4ec..72660ceb 100644 --- a/tests/auto/qquickmenubar/CMakeLists.txt +++ b/tests/auto/qquickmenubar/CMakeLists.txt @@ -24,6 +24,7 @@ qt_add_test(tst_qquickmenubar Qt::GuiPrivate Qt::QmlPrivate Qt::QuickControls2 + Qt::QuickControls2Private Qt::QuickPrivate Qt::QuickTemplates2Private Qt::TestPrivate diff --git a/tests/auto/qquickninepatchimage/CMakeLists.txt b/tests/auto/qquickninepatchimage/CMakeLists.txt index 23c2adb2..4372cbce 100644 --- a/tests/auto/qquickninepatchimage/CMakeLists.txt +++ b/tests/auto/qquickninepatchimage/CMakeLists.txt @@ -34,6 +34,7 @@ qt_add_test(tst_qquickninepatchimage Qt::QmlPrivate Qt::Quick Qt::QuickControls2 + Qt::QuickControls2Private Qt::QuickPrivate Qt::QuickTemplates2Private Qt::TestPrivate diff --git a/tests/auto/qquickpopup/CMakeLists.txt b/tests/auto/qquickpopup/CMakeLists.txt index beb744a7..43d6d778 100644 --- a/tests/auto/qquickpopup/CMakeLists.txt +++ b/tests/auto/qquickpopup/CMakeLists.txt @@ -24,6 +24,7 @@ qt_add_test(tst_qquickpopup Qt::GuiPrivate Qt::QmlPrivate Qt::QuickControls2 + Qt::QuickControls2Private Qt::QuickPrivate Qt::QuickTemplates2Private Qt::TestPrivate diff --git a/tests/auto/qquickstyle/CMakeLists.txt b/tests/auto/qquickstyle/CMakeLists.txt index 94aa7249..71e58cca 100644 --- a/tests/auto/qquickstyle/CMakeLists.txt +++ b/tests/auto/qquickstyle/CMakeLists.txt @@ -28,74 +28,29 @@ qt_add_test(tst_qquickstyle Qt::GuiPrivate Qt::QmlPrivate Qt::QuickControls2 + Qt::QuickControls2Private Qt::QuickPrivate Qt::QuickTemplates2Private Qt::TestPrivate TESTDATA ${test_data} ) -file(GLOB resource_glob_0 RELATIVE "${CMAKE_CURRENT_SOURCE_DIR}" "qrcStyles1/QrcStyle1/*.qml") -foreach(file IN LISTS resource_glob_0) - set_source_files_properties("${CMAKE_CURRENT_SOURCE_DIR}/${file}" PROPERTIES QT_RESOURCE_ALIAS "${file}") -endforeach() - -file(GLOB resource_glob_1 RELATIVE "${CMAKE_CURRENT_SOURCE_DIR}" "qrcStyles2/QrcStyle2/*.qml") -foreach(file IN LISTS resource_glob_1) - set_source_files_properties("${CMAKE_CURRENT_SOURCE_DIR}/${file}" PROPERTIES QT_RESOURCE_ALIAS "${file}") -endforeach() - -file(GLOB resource_glob_2 RELATIVE "${CMAKE_CURRENT_SOURCE_DIR}" "qrcStyles3/QrcStyle3/*.qml") -foreach(file IN LISTS resource_glob_2) - set_source_files_properties("${CMAKE_CURRENT_SOURCE_DIR}/${file}" PROPERTIES QT_RESOURCE_ALIAS "${file}") -endforeach() - -file(GLOB resource_glob_3 RELATIVE "${CMAKE_CURRENT_SOURCE_DIR}" "qrcStyles4/QrcStyle4/*.qml") -foreach(file IN LISTS resource_glob_3) - set_source_files_properties("${CMAKE_CURRENT_SOURCE_DIR}/${file}" PROPERTIES QT_RESOURCE_ALIAS "${file}") -endforeach() - # Resources: -set(qmake_qrcStyles1_resource_files - ${resource_glob_0} -) - -qt_add_resource(tst_qquickstyle "qmake_qrcStyles1" - PREFIX - "/" - FILES - ${qmake_qrcStyles1_resource_files} -) -set(qmake_qrcStyles2_resource_files - ${resource_glob_1} +set(qmake_custom_resource_files + "data/Custom/Label.qml" + "data/Custom/qmldir" ) -qt_add_resource(tst_qquickstyle "qmake_qrcStyles2" +qt_add_resource(tst_qquickstyle "qmake_custom" PREFIX "/" FILES - ${qmake_qrcStyles2_resource_files} -) -set(qmake_qrcStyles3_resource_files - ${resource_glob_2} + ${qmake_custom_resource_files} ) -qt_add_resource(tst_qquickstyle "qmake_qrcStyles3" - PREFIX - "/" - FILES - ${qmake_qrcStyles3_resource_files} -) -set(qmake_qrcStyles4_resource_files - ${resource_glob_3} -) - -qt_add_resource(tst_qquickstyle "qmake_qrcStyles4" - PREFIX - "/" - FILES - ${qmake_qrcStyles4_resource_files} -) +#### Keys ignored in scope 1:.:.:qquickstyle.pro:<TRUE>: +# OTHER_FILES = "data/CmdLineArgStyle/Control.qml" "data/CmdLineArgStyle/qmldir" "data/EnvVarStyle/Control.qml" "data/EnvVarStyle/qmldir" "data/EnvVarFallbackStyle/Control.qml" "data/EnvVarFallbackStyle/qmldir" ## Scopes: ##################################################################### diff --git a/tests/auto/sanity/CMakeLists.txt b/tests/auto/sanity/CMakeLists.txt index f7539771..fb2f2014 100644 --- a/tests/auto/sanity/CMakeLists.txt +++ b/tests/auto/sanity/CMakeLists.txt @@ -19,6 +19,7 @@ qt_add_test(tst_sanity Qt::Qml Qt::QmlPrivate Qt::QuickControls2 + Qt::QuickControls2Private Qt::QuickPrivate Qt::QuickTemplates2Private Qt::TestPrivate diff --git a/tests/auto/snippets/CMakeLists.txt b/tests/auto/snippets/CMakeLists.txt index f5d60a40..71bec579 100644 --- a/tests/auto/snippets/CMakeLists.txt +++ b/tests/auto/snippets/CMakeLists.txt @@ -19,6 +19,7 @@ qt_add_test(tst_snippets Qt::Gui Qt::Quick Qt::QuickControls2 + Qt::QuickControls2Private TESTDATA ${test_data} ) diff --git a/tests/auto/styleimports/CMakeLists.txt b/tests/auto/styleimports/CMakeLists.txt new file mode 100644 index 00000000..b5910e92 --- /dev/null +++ b/tests/auto/styleimports/CMakeLists.txt @@ -0,0 +1,62 @@ +# Generated from styleimports.pro. + +##################################################################### +## tst_styleimports Test: +##################################################################### + +# Collect test data +file(GLOB_RECURSE test_data_glob + RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} + data/*) +list(APPEND test_data ${test_data_glob}) + +qt_add_test(tst_styleimports + SOURCES + ../shared/qtest_quickcontrols.h + ../shared/util.cpp ../shared/util.h + ../shared/visualtestutil.cpp ../shared/visualtestutil.h + tst_styleimports.cpp + DEFINES + QQC2_IMPORT_PATH=\\\"${CMAKE_CURRENT_SOURCE_DIR}/../../../src/imports\\\" + PUBLIC_LIBRARIES + Qt::CorePrivate + Qt::Gui + Qt::GuiPrivate + Qt::QmlPrivate + Qt::QuickControls2 + Qt::QuickControls2Private + Qt::QuickPrivate + Qt::QuickTemplates2Private + Qt::TestPrivate + TESTDATA ${test_data} +) + +# Resources: +set(qmake_resourcestyle_resource_files + "ResourceStyle/Button.qml" + "ResourceStyle/qmldir" +) + +qt_add_resource(tst_styleimports "qmake_resourcestyle" + PREFIX + "/" + FILES + ${qmake_resourcestyle_resource_files} +) + + +#### Keys ignored in scope 1:.:.:styleimports.pro:<TRUE>: +# OTHER_FILES = "data/*.qml" "data/qmldir" "data/FileSystemStyle/*.qml" "data/FileSystemStyle/qmldir" "data/PlatformStyle/*.qml" "data/PlatformStyle/+linux/*.qml" "data/PlatformStyle/+macos/*.qml" "data/PlatformStyle/+windows/*.qml" "data/PlatformStyle/qmldir" + +## Scopes: +##################################################################### + +qt_extend_target(tst_styleimports CONDITION ANDROID OR IOS + DEFINES + QT_QMLTEST_DATADIR=\\\":/data\\\" +) + +qt_extend_target(tst_styleimports CONDITION NOT ANDROID AND NOT IOS + DEFINES + QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" +) diff --git a/tests/auto/translation/CMakeLists.txt b/tests/auto/translation/CMakeLists.txt index 50e10171..5b9c576d 100644 --- a/tests/auto/translation/CMakeLists.txt +++ b/tests/auto/translation/CMakeLists.txt @@ -24,6 +24,7 @@ qt_add_test(tst_translation Qt::GuiPrivate Qt::QmlPrivate Qt::QuickControls2 + Qt::QuickControls2Private Qt::QuickPrivate Qt::QuickTemplates2Private Qt::TestPrivate |