aboutsummaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
Diffstat (limited to 'tests')
-rw-r--r--tests/auto/CMakeLists.txt2
-rw-r--r--tests/auto/styleimports/.prev_CMakeLists.txt65
-rw-r--r--tests/auto/styleimports/CMakeLists.txt4
-rw-r--r--tests/auto/styleimportscompiletimematerial/CMakeLists.txt30
-rw-r--r--tests/auto/styleimportscompiletimeqmlonly/CMakeLists.txt30
-rw-r--r--tests/manual/nativestyle/CMakeLists.txt4
6 files changed, 87 insertions, 48 deletions
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)
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-19 18:10:31 +0000