9 files changed, 33 insertions, 25 deletions
diff --git a/examples/quick/dialogs/dialogs.pro b/examples/quick/dialogs/dialogs.pro
index b76f396e9d..538e75686c 100644
--- a/examples/quick/dialogs/dialogs.pro
+++ b/examples/quick/dialogs/dialogs.pro
@@ -1,17 +1,4 @@
-TEMPLATE = app
+TEMPLATE = subdirs
 
-QT += quick qml
-SOURCES += main.cpp
-RESOURCES += dialogs.qrc ../shared/shared.qrc
-
-OTHER_FILES += \
-    dialogs.qml \
-    FileDialogs.qml \
-    ColorDialogs.qml
-
-EXAMPLE_FILES = \
-    FileDialogs.qml \
-    ColorDialogs.qml
-
-target.path = $$[QT_INSTALL_EXAMPLES]/quick/dialogs
-INSTALLS += target
+SUBDIRS = \
+    systemdialogs
diff --git a/examples/quick/dialogs/ColorDialogs.qml b/examples/quick/dialogs/systemdialogs/ColorDialogs.qml
index 6a0af7f730..6a0af7f730 100644
--- a/examples/quick/dialogs/ColorDialogs.qml
+++ b/examples/quick/dialogs/systemdialogs/ColorDialogs.qml
diff --git a/examples/quick/dialogs/FileDialogs.qml b/examples/quick/dialogs/systemdialogs/FileDialogs.qml
index d1278609f9..d1278609f9 100644
--- a/examples/quick/dialogs/FileDialogs.qml
+++ b/examples/quick/dialogs/systemdialogs/FileDialogs.qml
diff --git a/examples/quick/dialogs/doc/images/dialogs-example.jpg b/examples/quick/dialogs/systemdialogs/doc/images/systemdialogs-example.jpg
index 4517a39308..4517a39308 100644
--- a/examples/quick/dialogs/doc/images/dialogs-example.jpg
+++ b/examples/quick/dialogs/systemdialogs/doc/images/systemdialogs-example.jpg
diff --git a/examples/quick/dialogs/doc/src/dialogs.qdoc b/examples/quick/dialogs/systemdialogs/doc/src/systemdialogs.qdoc
index daac914c60..9788be7343 100644
--- a/examples/quick/dialogs/doc/src/dialogs.qdoc
+++ b/examples/quick/dialogs/systemdialogs/doc/src/systemdialogs.qdoc
@@ -25,10 +25,10 @@
 **
 ****************************************************************************/
 /*!
-    \title Qt Quick Dialog Examples
-    \example dialogs
-    \brief This example demonstrates the dialog types in QML
-    \image dialogs-example.jpg
+    \title Qt Quick System Dialog Examples
+    \example systemdialogs
+    \brief This example demonstrates the system dialog types in QML
+    \image systemdialogs-example.jpg
     \ingroup qtquickdialog_examples
 
     This example demonstrates the system dialogs in the \l{Qt Quick Dialogs}
@@ -36,9 +36,13 @@
 
     A \l FileDialog is used to choose a single file, multiple files or a
     single directory, depending on how it is configured.
-    \snippet dialogs/FileDialogs.qml filedialog
+    \snippet systemdialogs/FileDialogs.qml filedialog
 
     A \l ColorDialog is used to choose a color, with or without alpha (transparency)
     depending on how it is configured.
-    \snippet dialogs/ColorDialogs.qml colordialog
+    \snippet systemdialogs/ColorDialogs.qml colordialog
+
+    The example can be built as a standalone executable, but each
+    type of dialog is demonstrated in a separate QML file which can
+    also be run separately with qmlscene.
 */
diff --git a/examples/quick/dialogs/main.cpp b/examples/quick/dialogs/systemdialogs/main.cpp
index bbf0c48104..2119227c1f 100644
--- a/examples/quick/dialogs/main.cpp
+++ b/examples/quick/dialogs/systemdialogs/main.cpp
@@ -37,5 +37,5 @@
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
-#include "../shared/shared.h"
-DECLARATIVE_EXAMPLE_MAIN(dialogs/dialogs)
+#include "../../shared/shared.h"
+DECLARATIVE_EXAMPLE_MAIN(dialogs/systemdialogs)
diff --git a/examples/quick/dialogs/systemdialogs/systemdialogs.pro b/examples/quick/dialogs/systemdialogs/systemdialogs.pro
new file mode 100644
index 0000000000..e8c3e9857b
--- /dev/null
+++ b/examples/quick/dialogs/systemdialogs/systemdialogs.pro
@@ -0,0 +1,17 @@
+TEMPLATE = app
+
+QT += quick qml
+SOURCES += main.cpp
+RESOURCES += systemdialogs.qrc ../../shared/shared.qrc
+
+OTHER_FILES += \
+    systemdialogs.qml \
+    FileDialogs.qml \
+    ColorDialogs.qml
+
+EXAMPLE_FILES = \
+    FileDialogs.qml \
+    ColorDialogs.qml
+
+target.path = $$[QT_INSTALL_EXAMPLES]/quick/dialogs
+INSTALLS += target
diff --git a/examples/quick/dialogs/dialogs.qml b/examples/quick/dialogs/systemdialogs/systemdialogs.qml
index b5f9841a3f..b5f9841a3f 100644
--- a/examples/quick/dialogs/dialogs.qml
+++ b/examples/quick/dialogs/systemdialogs/systemdialogs.qml
diff --git a/examples/quick/dialogs/dialogs.qrc b/examples/quick/dialogs/systemdialogs/systemdialogs.qrc
index efebfe4845..b90b99f7f5 100644
--- a/examples/quick/dialogs/dialogs.qrc
+++ b/examples/quick/dialogs/systemdialogs/systemdialogs.qrc
@@ -1,6 +1,6 @@
 <RCC>
     <qresource prefix="/dialogs">
-        <file>dialogs.qml</file>
+        <file>systemdialogs.qml</file>
         <file>FileDialogs.qml</file>
         <file>ColorDialogs.qml</file>
     </qresource>