aboutsummaryrefslogtreecommitdiffstats
path: root/tests/manual
diff options
context:
space:
mode:
authorMitch Curtis <mitch.curtis@qt.io>2021-12-14 14:41:01 +0100
committerQt Cherry-pick Bot <cherrypick_bot@qt-project.org>2021-12-24 07:53:46 +0000
commite48ffb5ec9f62856a5fd247a69ffc7e4c2f1f40b (patch)
tree1a133df67bbf66ed90f894777e99e4e0ac671227 /tests/manual
parentadd9189003350251350aa60c200ce0c0f1b5c5d9 (diff)
Restructure Qt Quick Dialogs tests
- Move contents of tests/auto/quickcontrols2/dialogs to tests/auto/quickdialogs. - Move tests/manual/quickcontrols2/dialogs to tests/manual/quickdialogs/dialogs. This makes the dialogs tests consistent with other modules that have their own "top-level" test directories. Fixes: QTBUG-99034 Change-Id: I4ba155433507870fa607100af1b7957f8430727c Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io> (cherry picked from commit 2dc1080f5f14c0b15a40e210d17a403c7490a18e) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
Diffstat (limited to 'tests/manual')
-rw-r--r--tests/manual/CMakeLists.txt1
-rw-r--r--tests/manual/quickcontrols2/CMakeLists.txt1
-rw-r--r--tests/manual/quickcontrols2/manual.pro1
-rw-r--r--tests/manual/quickdialogs/CMakeLists.txt1
-rw-r--r--tests/manual/quickdialogs/dialogs/CMakeLists.txt (renamed from tests/manual/quickcontrols2/dialogs/CMakeLists.txt)0
-rw-r--r--tests/manual/quickdialogs/dialogs/FileDialogPage.qml (renamed from tests/manual/quickcontrols2/dialogs/FileDialogPage.qml)0
-rw-r--r--tests/manual/quickdialogs/dialogs/FolderDialogPage.qml (renamed from tests/manual/quickcontrols2/dialogs/FolderDialogPage.qml)0
-rw-r--r--tests/manual/quickdialogs/dialogs/FontDialogPage.qml (renamed from tests/manual/quickcontrols2/dialogs/FontDialogPage.qml)0
-rw-r--r--tests/manual/quickdialogs/dialogs/MessageDialogPage.qml (renamed from tests/manual/quickcontrols2/dialogs/MessageDialogPage.qml)0
-rw-r--r--tests/manual/quickdialogs/dialogs/StringListView.qml (renamed from tests/manual/quickcontrols2/dialogs/StringListView.qml)0
-rw-r--r--tests/manual/quickdialogs/dialogs/Theme.qml (renamed from tests/manual/quickcontrols2/dialogs/Theme.qml)0
-rw-r--r--tests/manual/quickdialogs/dialogs/dialogs.cpp (renamed from tests/manual/quickcontrols2/dialogs/dialogs.cpp)0
-rw-r--r--tests/manual/quickdialogs/dialogs/dialogs.pro (renamed from tests/manual/quickcontrols2/dialogs/dialogs.pro)0
-rw-r--r--tests/manual/quickdialogs/dialogs/dialogs.qml (renamed from tests/manual/quickcontrols2/dialogs/dialogs.qml)0
-rw-r--r--tests/manual/quickdialogs/dialogs/qmldir (renamed from tests/manual/quickcontrols2/dialogs/qmldir)0
15 files changed, 2 insertions, 2 deletions
diff --git a/tests/manual/CMakeLists.txt b/tests/manual/CMakeLists.txt
index 8c442655a5..91628f0e51 100644
--- a/tests/manual/CMakeLists.txt
+++ b/tests/manual/CMakeLists.txt
@@ -13,3 +13,4 @@ add_subdirectory(text)
add_subdirectory(touch)
# add_subdirectory(v4) # TODO: port if needed
add_subdirectory(quickcontrols2)
+add_subdirectory(quickdialogs)
diff --git a/tests/manual/quickcontrols2/CMakeLists.txt b/tests/manual/quickcontrols2/CMakeLists.txt
index 4587ecf1cd..921e307121 100644
--- a/tests/manual/quickcontrols2/CMakeLists.txt
+++ b/tests/manual/quickcontrols2/CMakeLists.txt
@@ -1,7 +1,6 @@
# Generated from manual.pro.
add_subdirectory(buttons)
-add_subdirectory(dialogs)
add_subdirectory(fonts)
add_subdirectory(gifs)
add_subdirectory(headerview)
diff --git a/tests/manual/quickcontrols2/manual.pro b/tests/manual/quickcontrols2/manual.pro
index 27ec27f18d..7010d902f1 100644
--- a/tests/manual/quickcontrols2/manual.pro
+++ b/tests/manual/quickcontrols2/manual.pro
@@ -1,7 +1,6 @@
TEMPLATE = subdirs
SUBDIRS += \
buttons \
- dialogs \
fonts \
gifs \
headerview \
diff --git a/tests/manual/quickdialogs/CMakeLists.txt b/tests/manual/quickdialogs/CMakeLists.txt
new file mode 100644
index 0000000000..f58b9ce388
--- /dev/null
+++ b/tests/manual/quickdialogs/CMakeLists.txt
@@ -0,0 +1 @@
+add_subdirectory(dialogs)
diff --git a/tests/manual/quickcontrols2/dialogs/CMakeLists.txt b/tests/manual/quickdialogs/dialogs/CMakeLists.txt
index 0980f40c40..0980f40c40 100644
--- a/tests/manual/quickcontrols2/dialogs/CMakeLists.txt
+++ b/tests/manual/quickdialogs/dialogs/CMakeLists.txt
diff --git a/tests/manual/quickcontrols2/dialogs/FileDialogPage.qml b/tests/manual/quickdialogs/dialogs/FileDialogPage.qml
index 211725b8ce..211725b8ce 100644
--- a/tests/manual/quickcontrols2/dialogs/FileDialogPage.qml
+++ b/tests/manual/quickdialogs/dialogs/FileDialogPage.qml
diff --git a/tests/manual/quickcontrols2/dialogs/FolderDialogPage.qml b/tests/manual/quickdialogs/dialogs/FolderDialogPage.qml
index 3f405bae48..3f405bae48 100644
--- a/tests/manual/quickcontrols2/dialogs/FolderDialogPage.qml
+++ b/tests/manual/quickdialogs/dialogs/FolderDialogPage.qml
diff --git a/tests/manual/quickcontrols2/dialogs/FontDialogPage.qml b/tests/manual/quickdialogs/dialogs/FontDialogPage.qml
index d79fe9e441..d79fe9e441 100644
--- a/tests/manual/quickcontrols2/dialogs/FontDialogPage.qml
+++ b/tests/manual/quickdialogs/dialogs/FontDialogPage.qml
diff --git a/tests/manual/quickcontrols2/dialogs/MessageDialogPage.qml b/tests/manual/quickdialogs/dialogs/MessageDialogPage.qml
index 7e66ed770e..7e66ed770e 100644
--- a/tests/manual/quickcontrols2/dialogs/MessageDialogPage.qml
+++ b/tests/manual/quickdialogs/dialogs/MessageDialogPage.qml
diff --git a/tests/manual/quickcontrols2/dialogs/StringListView.qml b/tests/manual/quickdialogs/dialogs/StringListView.qml
index 4a229404fc..4a229404fc 100644
--- a/tests/manual/quickcontrols2/dialogs/StringListView.qml
+++ b/tests/manual/quickdialogs/dialogs/StringListView.qml
diff --git a/tests/manual/quickcontrols2/dialogs/Theme.qml b/tests/manual/quickdialogs/dialogs/Theme.qml
index 8114f14eb1..8114f14eb1 100644
--- a/tests/manual/quickcontrols2/dialogs/Theme.qml
+++ b/tests/manual/quickdialogs/dialogs/Theme.qml
diff --git a/tests/manual/quickcontrols2/dialogs/dialogs.cpp b/tests/manual/quickdialogs/dialogs/dialogs.cpp
index 8bab70e26d..8bab70e26d 100644
--- a/tests/manual/quickcontrols2/dialogs/dialogs.cpp
+++ b/tests/manual/quickdialogs/dialogs/dialogs.cpp
diff --git a/tests/manual/quickcontrols2/dialogs/dialogs.pro b/tests/manual/quickdialogs/dialogs/dialogs.pro
index abf80c5660..abf80c5660 100644
--- a/tests/manual/quickcontrols2/dialogs/dialogs.pro
+++ b/tests/manual/quickdialogs/dialogs/dialogs.pro
diff --git a/tests/manual/quickcontrols2/dialogs/dialogs.qml b/tests/manual/quickdialogs/dialogs/dialogs.qml
index 00655a1752..00655a1752 100644
--- a/tests/manual/quickcontrols2/dialogs/dialogs.qml
+++ b/tests/manual/quickdialogs/dialogs/dialogs.qml
diff --git a/tests/manual/quickcontrols2/dialogs/qmldir b/tests/manual/quickdialogs/dialogs/qmldir
index 4f4a6b7bf9..4f4a6b7bf9 100644
--- a/tests/manual/quickcontrols2/dialogs/qmldir
+++ b/tests/manual/quickdialogs/dialogs/qmldir