Rename dialogs manual test to qquickdialog

In preparation for Qt Quick Dialogs, which will get their own manual
test since they have different goals and one cannot be used for both.

Change-Id: I63143b7603a3ed79c1a9a938d45bfe452926a44d
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>

11 files changed, 32 insertions, 40 deletions

diff --git a/tests/manual/CMakeLists.txt b/tests/manual/CMakeLists.txt
index 79d19753..92ecd4be 100644
--- a/tests/manual/CMakeLists.txt
+++ b/tests/manual/CMakeLists.txt
@@ -4,6 +4,7 @@ add_subdirectory(buttons)
 add_subdirectory(gifs)
 add_subdirectory(fonts)
 add_subdirectory(headerview)
+add_subdirectory(qquickdialog)
 add_subdirectory(screenshots)
 add_subdirectory(styles)
 add_subdirectory(testbench)
diff --git a/tests/manual/dialogs/CMakeLists.txt b/tests/manual/dialogs/CMakeLists.txt
deleted file mode 100644
index b0fe5dd5..00000000
--- a/tests/manual/dialogs/CMakeLists.txt
+++ /dev/null
@@ -1,35 +0,0 @@
-# Generated from dialogs.pro.
-
-#####################################################################
-## dialogs Binary:
-#####################################################################
-
-qt_internal_add_manual_test(dialogs
-    GUI
-    SOURCES
-        dialogs.cpp
-    PUBLIC_LIBRARIES
-        Qt::Gui
-        Qt::Qml
-        Qt::QuickControls2
-)
-
-# Resources:
-set(qmake_immediate_resource_files
-    "CustomDialog.qml"
-    "DialogLabel.qml"
-    "Marker.qml"
-    "dialogs.qml"
-    "qtquickcontrols2.conf"
-)
-
-qt_internal_add_resource(dialogs "qmake_immediate"
-    PREFIX
-        "/"
-    FILES
-        ${qmake_immediate_resource_files}
-)
-
-
-#### Keys ignored in scope 1:.:.:dialogs.pro:<TRUE>:
-# TEMPLATE = "app"
diff --git a/tests/manual/manual.pro b/tests/manual/manual.pro
index fba3c12a..8107cfc5 100644
--- a/tests/manual/manual.pro
+++ b/tests/manual/manual.pro
@@ -4,6 +4,7 @@ SUBDIRS += \
     gifs \
     fonts \
     headerview \
+    qquickdialog \
     screenshots \
     styles \
     testbench
diff --git a/tests/manual/qquickdialog/CMakeLists.txt b/tests/manual/qquickdialog/CMakeLists.txt
new file mode 100644
index 00000000..10d14d53
--- /dev/null
+++ b/tests/manual/qquickdialog/CMakeLists.txt
@@ -0,0 +1,25 @@
+qt_internal_add_manual_test(qquickdialog
+    GUI
+    SOURCES
+        qquickdialog.cpp
+    PUBLIC_LIBRARIES
+        Qt::Gui
+        Qt::Qml
+        Qt::QuickControls2
+)
+
+# Resources:
+set(qmake_immediate_resource_files
+    "CustomDialog.qml"
+    "DialogLabel.qml"
+    "Marker.qml"
+    "qquickdialog.qml"
+    "qtquickcontrols2.conf"
+)
+
+qt_internal_add_resource(qquickdialog "qmake_immediate"
+    PREFIX
+        "/"
+    FILES
+        ${qmake_immediate_resource_files}
+)
diff --git a/tests/manual/dialogs/CustomDialog.qml b/tests/manual/qquickdialog/CustomDialog.qml
index fb191c9f..fb191c9f 100644
--- a/tests/manual/dialogs/CustomDialog.qml
+++ b/tests/manual/qquickdialog/CustomDialog.qml
diff --git a/tests/manual/dialogs/DialogLabel.qml b/tests/manual/qquickdialog/DialogLabel.qml
index 3a1533eb..3a1533eb 100644
--- a/tests/manual/dialogs/DialogLabel.qml
+++ b/tests/manual/qquickdialog/DialogLabel.qml
diff --git a/tests/manual/dialogs/Marker.qml b/tests/manual/qquickdialog/Marker.qml
index cd93d055..cd93d055 100644
--- a/tests/manual/dialogs/Marker.qml
+++ b/tests/manual/qquickdialog/Marker.qml
diff --git a/tests/manual/dialogs/dialogs.cpp b/tests/manual/qquickdialog/qquickdialog.cpp
index 79d26c2b..77863abe 100644
--- a/tests/manual/dialogs/dialogs.cpp
+++ b/tests/manual/qquickdialog/qquickdialog.cpp
@@ -56,7 +56,7 @@ int main(int argc, char *argv[])
     QGuiApplication app(argc, argv);
 
     QQmlApplicationEngine engine;
-    engine.load(QUrl("qrc:/dialogs.qml"));
+    engine.load(QUrl("qrc:/qquickdialog.qml"));
 
     return app.exec();
 }
diff --git a/tests/manual/dialogs/dialogs.pro b/tests/manual/qquickdialog/qquickdialog.pro
index 4863923f..aee7655b 100644
--- a/tests/manual/dialogs/dialogs.pro
+++ b/tests/manual/qquickdialog/qquickdialog.pro
@@ -1,11 +1,11 @@
 TEMPLATE = app
-TARGET = dialogs
+TARGET = qquickdialog
 QT += qml quickcontrols2
 
-SOURCES += dialogs.cpp
+SOURCES += qquickdialog.cpp
 RESOURCES += \
     qtquickcontrols2.conf \
-    dialogs.qml \
+    qquickdialog.qml \
     Marker.qml \
     CustomDialog.qml \
     DialogLabel.qml
diff --git a/tests/manual/dialogs/dialogs.qml b/tests/manual/qquickdialog/qquickdialog.qml
index e7c8c2e1..41bf6ab7 100644
--- a/tests/manual/dialogs/dialogs.qml
+++ b/tests/manual/qquickdialog/qquickdialog.qml
@@ -56,7 +56,7 @@ ApplicationWindow {
     id: window
     width: 1200
     height: 800
-    title: "Buttons"
+    title: "qquickdialog"
     visible: true
 
     property alias visualizeDialogButtonBoxContentItem: visualizeDialogButtonBoxContentItemMenuItem.checked
diff --git a/tests/manual/dialogs/qtquickcontrols2.conf b/tests/manual/qquickdialog/qtquickcontrols2.conf
index 53f380bf..53f380bf 100644
--- a/tests/manual/dialogs/qtquickcontrols2.conf
+++ b/tests/manual/qquickdialog/qtquickcontrols2.conf