diff options
-rw-r--r-- | src/imports/controls/CMakeLists.txt | 1 | ||||
-rw-r--r-- | src/imports/controls/fusion/CMakeLists.txt | 1 | ||||
-rw-r--r-- | src/imports/controls/material/CMakeLists.txt | 1 | ||||
-rw-r--r-- | src/imports/controls/universal/CMakeLists.txt | 1 | ||||
-rw-r--r-- | src/imports/nativestyle/CMakeLists.txt | 1 | ||||
-rw-r--r-- | tests/auto/CMakeLists.txt | 2 | ||||
-rw-r--r-- | tests/auto/styleimports/.prev_CMakeLists.txt | 65 | ||||
-rw-r--r-- | tests/auto/styleimports/CMakeLists.txt | 4 | ||||
-rw-r--r-- | tests/auto/styleimportscompiletimematerial/CMakeLists.txt | 30 | ||||
-rw-r--r-- | tests/auto/styleimportscompiletimeqmlonly/CMakeLists.txt | 30 | ||||
-rw-r--r-- | tests/manual/nativestyle/CMakeLists.txt | 4 |
11 files changed, 87 insertions, 53 deletions
diff --git a/src/imports/controls/CMakeLists.txt b/src/imports/controls/CMakeLists.txt index 8a7f6cfd..bc5fbaa0 100644 --- a/src/imports/controls/CMakeLists.txt +++ b/src/imports/controls/CMakeLists.txt @@ -5,7 +5,6 @@ ##################################################################### qt_add_qml_module(qtquickcontrols2plugin - TARGET_PATH "QtQuick/Controls" URI "QtQuick.Controls" VERSION "6.0" # special case DESIGNER_SUPPORTED diff --git a/src/imports/controls/fusion/CMakeLists.txt b/src/imports/controls/fusion/CMakeLists.txt index 72a40cfb..0298f38e 100644 --- a/src/imports/controls/fusion/CMakeLists.txt +++ b/src/imports/controls/fusion/CMakeLists.txt @@ -5,7 +5,6 @@ ##################################################################### qt_add_qml_module(qtquickcontrols2fusionstyleplugin - TARGET_PATH "QtQuick/Controls/Fusion" URI "QtQuick.Controls.Fusion" VERSION "6.0" # special case CLASSNAME QtQuickControls2FusionStylePlugin diff --git a/src/imports/controls/material/CMakeLists.txt b/src/imports/controls/material/CMakeLists.txt index 7bc30a96..a52cb168 100644 --- a/src/imports/controls/material/CMakeLists.txt +++ b/src/imports/controls/material/CMakeLists.txt @@ -5,7 +5,6 @@ ##################################################################### qt_add_qml_module(qtquickcontrols2materialstyleplugin - TARGET_PATH "QtQuick/Controls/Material" URI "QtQuick.Controls.Material" VERSION "6.0" # special case CLASSNAME QtQuickControls2MaterialStylePlugin diff --git a/src/imports/controls/universal/CMakeLists.txt b/src/imports/controls/universal/CMakeLists.txt index 67ccab9b..8b671821 100644 --- a/src/imports/controls/universal/CMakeLists.txt +++ b/src/imports/controls/universal/CMakeLists.txt @@ -5,7 +5,6 @@ ##################################################################### qt_add_qml_module(qtquickcontrols2universalstyleplugin - TARGET_PATH "QtQuick/Controls/Universal" URI "QtQuick.Controls.Universal" VERSION "6.0" # special case CLASSNAME QtQuickControls2UniversalStylePlugin diff --git a/src/imports/nativestyle/CMakeLists.txt b/src/imports/nativestyle/CMakeLists.txt index a814e72d..1b6ce728 100644 --- a/src/imports/nativestyle/CMakeLists.txt +++ b/src/imports/nativestyle/CMakeLists.txt @@ -80,7 +80,6 @@ qt_extend_target(qtquickcontrols2nativestyleplugin CONDITION WIN32 qstyle/windows/qquickwindowsstyle.cpp qstyle/windows/qquickwindowsstyle_p.h qstyle/windows/qquickwindowsstyle_p_p.h qstyle/windows/qquickwindowsxpstyle.cpp - qstyle/windows/qquickwindowsxpstyle_p.h qstyle/windows/qquickwindowsxpstyle_p_p.h INCLUDE_DIRECTORIES qstyle/windows LIBRARIES diff --git a/tests/auto/CMakeLists.txt b/tests/auto/CMakeLists.txt index 68aba613..5d7302c3 100644 --- a/tests/auto/CMakeLists.txt +++ b/tests/auto/CMakeLists.txt @@ -30,4 +30,6 @@ add_subdirectory(revisions) add_subdirectory(sanity) add_subdirectory(snippets) add_subdirectory(styleimports) +add_subdirectory(styleimportscompiletimematerial) +add_subdirectory(styleimportscompiletimeqmlonly) add_subdirectory(translation) diff --git a/tests/auto/styleimports/.prev_CMakeLists.txt b/tests/auto/styleimports/.prev_CMakeLists.txt new file mode 100644 index 00000000..108a2054 --- /dev/null +++ b/tests/auto/styleimports/.prev_CMakeLists.txt @@ -0,0 +1,65 @@ +# 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::QuickControls2ImplPrivate + Qt::QuickControls2Private + Qt::QuickPrivate + Qt::QuickTemplates2Private + Qt::TestPrivate + TESTDATA ${test_data} +) + +# Resources: +set(qmake_resourcestyle_resource_files + "resources/ResourceStyle/Button.qml" + "resources/ResourceStyle/qmldir" +) + +qt_add_resource(tst_styleimports "qmake_resourcestyle" + PREFIX + "/" + BASE + "resources" + 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/styleimports/CMakeLists.txt b/tests/auto/styleimports/CMakeLists.txt index 86db761a..27ba24e7 100644 --- a/tests/auto/styleimports/CMakeLists.txt +++ b/tests/auto/styleimports/CMakeLists.txt @@ -34,10 +34,6 @@ qt_add_test(tst_styleimports # Resources: set(qmake_resourcestyle_resource_files - "resources/ResourceStyle/Button.qml" - "resources/ResourceStyle/qmldir" -) -set(qmake_resourcestyle_resource_files "ResourceStyle/Button.qml" # special case: QTBUG-86726 "ResourceStyle/qmldir" # special case ) diff --git a/tests/auto/styleimportscompiletimematerial/CMakeLists.txt b/tests/auto/styleimportscompiletimematerial/CMakeLists.txt index b5910e92..af167d0c 100644 --- a/tests/auto/styleimportscompiletimematerial/CMakeLists.txt +++ b/tests/auto/styleimportscompiletimematerial/CMakeLists.txt @@ -1,7 +1,7 @@ -# Generated from styleimports.pro. +# Generated from styleimportscompiletimematerial.pro. ##################################################################### -## tst_styleimports Test: +## tst_styleimportscompiletimematerial Test: ##################################################################### # Collect test data @@ -10,12 +10,12 @@ file(GLOB_RECURSE test_data_glob data/*) list(APPEND test_data ${test_data_glob}) -qt_add_test(tst_styleimports +qt_add_test(tst_styleimportscompiletimematerial SOURCES ../shared/qtest_quickcontrols.h ../shared/util.cpp ../shared/util.h ../shared/visualtestutil.cpp ../shared/visualtestutil.h - tst_styleimports.cpp + tst_styleimportscompiletimematerial.cpp DEFINES QQC2_IMPORT_PATH=\\\"${CMAKE_CURRENT_SOURCE_DIR}/../../../src/imports\\\" PUBLIC_LIBRARIES @@ -31,32 +31,18 @@ qt_add_test(tst_styleimports 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" +#### Keys ignored in scope 1:.:.:styleimportscompiletimematerial.pro:<TRUE>: +# OTHER_FILES = "data/*.qml" ## Scopes: ##################################################################### -qt_extend_target(tst_styleimports CONDITION ANDROID OR IOS +qt_extend_target(tst_styleimportscompiletimematerial CONDITION ANDROID OR IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" ) -qt_extend_target(tst_styleimports CONDITION NOT ANDROID AND NOT IOS +qt_extend_target(tst_styleimportscompiletimematerial CONDITION NOT ANDROID AND NOT IOS DEFINES QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" ) diff --git a/tests/auto/styleimportscompiletimeqmlonly/CMakeLists.txt b/tests/auto/styleimportscompiletimeqmlonly/CMakeLists.txt index b5910e92..4a59c682 100644 --- a/tests/auto/styleimportscompiletimeqmlonly/CMakeLists.txt +++ b/tests/auto/styleimportscompiletimeqmlonly/CMakeLists.txt @@ -1,7 +1,7 @@ -# Generated from styleimports.pro. +# Generated from styleimportscompiletimeqmlonly.pro. ##################################################################### -## tst_styleimports Test: +## tst_styleimportscompiletimeqmlonly Test: ##################################################################### # Collect test data @@ -10,12 +10,12 @@ file(GLOB_RECURSE test_data_glob data/*) list(APPEND test_data ${test_data_glob}) -qt_add_test(tst_styleimports +qt_add_test(tst_styleimportscompiletimeqmlonly SOURCES ../shared/qtest_quickcontrols.h ../shared/util.cpp ../shared/util.h ../shared/visualtestutil.cpp ../shared/visualtestutil.h - tst_styleimports.cpp + tst_styleimportscompiletimeqmlonly.cpp DEFINES QQC2_IMPORT_PATH=\\\"${CMAKE_CURRENT_SOURCE_DIR}/../../../src/imports\\\" PUBLIC_LIBRARIES @@ -31,32 +31,18 @@ qt_add_test(tst_styleimports 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" +#### Keys ignored in scope 1:.:.:styleimportscompiletimeqmlonly.pro:<TRUE>: +# OTHER_FILES = "data/*.qml" "data/QmlOnly/*.qml" "data/QmlOnly/qmldir" ## Scopes: ##################################################################### -qt_extend_target(tst_styleimports CONDITION ANDROID OR IOS +qt_extend_target(tst_styleimportscompiletimeqmlonly CONDITION ANDROID OR IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" ) -qt_extend_target(tst_styleimports CONDITION NOT ANDROID AND NOT IOS +qt_extend_target(tst_styleimportscompiletimeqmlonly CONDITION NOT ANDROID AND NOT IOS DEFINES QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" ) diff --git a/tests/manual/nativestyle/CMakeLists.txt b/tests/manual/nativestyle/CMakeLists.txt index e4712a6e..af6aa7e8 100644 --- a/tests/manual/nativestyle/CMakeLists.txt +++ b/tests/manual/nativestyle/CMakeLists.txt @@ -1,4 +1,8 @@ # Generated from desktopgallery.pro. +# special case skip regeneration +# Remove the skip, after somebody figures out if this is supposed +# to be a manual test, or a full-blown project like it is now +# because it was copied over from an example. cmake_minimum_required(VERSION 3.14) project(desktopgallery LANGUAGES CXX) |