9 files changed, 69 insertions, 17 deletions
diff --git a/examples/quick/dialogs/ColorDialogs.qml b/examples/quick/dialogs/colorandfiledialogs/ColorDialogs.qml
index f3d253aa8c..6a0af7f730 100644
--- a/examples/quick/dialogs/ColorDialogs.qml
+++ b/examples/quick/dialogs/colorandfiledialogs/ColorDialogs.qml
@@ -49,6 +49,7 @@ Rectangle {
     SystemPalette { id: palette }
     clip: true
 
+    //! [colordialog]
     ColorDialog {
         id: colorDialog
         visible: colorDialogVisible.checked
@@ -59,6 +60,7 @@ Rectangle {
         onAccepted: { console.log("Accepted: " + color) }
         onRejected: { console.log("Rejected") }
     }
+    //! [colordialog]
 
     Column {
         anchors.fill: parent
diff --git a/examples/quick/dialogs/FileDialogs.qml b/examples/quick/dialogs/colorandfiledialogs/FileDialogs.qml
index 8ed64b0b3c..d1278609f9 100644
--- a/examples/quick/dialogs/FileDialogs.qml
+++ b/examples/quick/dialogs/colorandfiledialogs/FileDialogs.qml
@@ -49,6 +49,7 @@ Rectangle {
     SystemPalette { id: palette }
     clip: true
 
+    //! [filedialog]
     FileDialog {
         id: fileDialog
         visible: fileDialogVisible.checked
@@ -63,6 +64,7 @@ Rectangle {
         onAccepted: { console.log("Accepted: " + fileUrls) }
         onRejected: { console.log("Rejected") }
     }
+    //! [filedialog]
 
     Column {
         anchors.fill: parent
diff --git a/examples/quick/dialogs/colorandfiledialogs/colorandfiledialogs.pro b/examples/quick/dialogs/colorandfiledialogs/colorandfiledialogs.pro
new file mode 100644
index 0000000000..3a7b25c91a
--- /dev/null
+++ b/examples/quick/dialogs/colorandfiledialogs/colorandfiledialogs.pro
@@ -0,0 +1,17 @@
+TEMPLATE = app
+
+QT += quick qml
+SOURCES += main.cpp
+RESOURCES += colorandfiledialogs.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
diff --git a/examples/quick/dialogs/dialogs.qrc b/examples/quick/dialogs/colorandfiledialogs/colorandfiledialogs.qrc
index efebfe4845..efebfe4845 100644
--- a/examples/quick/dialogs/dialogs.qrc
+++ b/examples/quick/dialogs/colorandfiledialogs/colorandfiledialogs.qrc
diff --git a/examples/quick/dialogs/dialogs.qml b/examples/quick/dialogs/colorandfiledialogs/dialogs.qml
index b5f9841a3f..b5f9841a3f 100644
--- a/examples/quick/dialogs/dialogs.qml
+++ b/examples/quick/dialogs/colorandfiledialogs/dialogs.qml
diff --git a/examples/quick/dialogs/colorandfiledialogs/doc/images/qml-colorandfiledialogs-example.jpg b/examples/quick/dialogs/colorandfiledialogs/doc/images/qml-colorandfiledialogs-example.jpg
new file mode 100644
index 0000000000..4517a39308
--- /dev/null
+++ b/examples/quick/dialogs/colorandfiledialogs/doc/images/qml-colorandfiledialogs-example.jpg
diff --git a/examples/quick/dialogs/colorandfiledialogs/doc/src/colorandfiledialogs.qdoc b/examples/quick/dialogs/colorandfiledialogs/doc/src/colorandfiledialogs.qdoc
new file mode 100644
index 0000000000..e3d021dba8
--- /dev/null
+++ b/examples/quick/dialogs/colorandfiledialogs/doc/src/colorandfiledialogs.qdoc
@@ -0,0 +1,44 @@
+/****************************************************************************
+**
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/legal
+**
+** This file is part of the documentation of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:FDL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia.  For licensing terms and
+** conditions see http://qt.digia.com/licensing.  For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
+** GNU Free Documentation License Usage
+** Alternatively, this file may be used under the terms of the GNU Free
+** Documentation License version 1.3 as published by the Free Software
+** Foundation and appearing in the file included in the packaging of
+** this file.  Please review the following information to ensure
+** the GNU Free Documentation License version 1.3 requirements
+** will be met: http://www.gnu.org/copyleft/fdl.html.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+/*!
+    \title Qt Quick ColorDialog and FileDialog Examples
+    \example colorandfiledialogs
+    \brief This example demonstrates the color and file dialog types in QML
+    \image qml-colorandfiledialogs-example.jpg
+    \ingroup qtquickdialog_examples
+
+    This example demonstrates the color and file system dialogs in the \l{Qt Quick Dialogs}
+    module. The appearance and behavior is platform-dependent.
+
+    A \l FileDialog is used to choose a single file, multiple files or a
+    single directory, depending on how it is configured.
+    \snippet dialogs/colorandfiledialogs/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/colorandfiledialogs/ColorDialogs.qml colordialog
+*/
diff --git a/examples/quick/dialogs/main.cpp b/examples/quick/dialogs/colorandfiledialogs/main.cpp
index bbf0c48104..e8c2ae6aaa 100644
--- a/examples/quick/dialogs/main.cpp
+++ b/examples/quick/dialogs/colorandfiledialogs/main.cpp
@@ -37,5 +37,5 @@
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
-#include "../shared/shared.h"
+#include "../../shared/shared.h"
 DECLARATIVE_EXAMPLE_MAIN(dialogs/dialogs)
diff --git a/examples/quick/dialogs/dialogs.pro b/examples/quick/dialogs/dialogs.pro
index b76f396e9d..275e36470f 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 = \
+    colorandfiledialogs