From: Caroline Chao <caroline.chao@digia.com>
Date: Mon, 27 May 2013 12:20:31 +0000 (+0200)
Subject: Doc: Add Qt Quick Dialogs to Qt Quick submodules list
X-Git-Url: http://git.silmor.de/gitweb/?a=commitdiff_plain;h=e077f63682b3747bae25612bd78cbe4dc750d0af;p=konrad%2Fqtdeclarative.git

Doc: Add Qt Quick Dialogs to Qt Quick submodules list

And add a landing page for Qt Quick Dialogs.

Change-Id: I0c2611bf5cdbf9937b4fd94228915553d8b3bb77
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com>
---

diff --git a/src/imports/dialogs/plugin.cpp b/src/imports/dialogs/plugin.cpp
index 67653e5..bee0ee0 100644
--- a/src/imports/dialogs/plugin.cpp
+++ b/src/imports/dialogs/plugin.cpp
@@ -55,9 +55,36 @@
 
 QT_BEGIN_NAMESPACE
 
+
+/*!
+    \group dialogs
+    \title Dialogs
+*/
+
+/*!
+    \page qtquickdialogs-index.html
+    \title Qt Quick Dialogs
+
+    \brief Qt Quick Dialogs submodule
+
+    The submodule is new in Qt 5.1.
+
+    \section1 Dialogs
+
+    \annotatedlist dialogs
+
+    \section1 Related information
+
+    \section2 Reference
+     \list
+      \li \l{Qt Quick Dialogs QML Types}{Qt Quick Dialogs QML Types}
+     \endlist
+
+*/
+
 /*!
     \qmlmodule QtQuick.Dialogs 1
-    \title Qt Quick Dialog QML Types
+    \title Qt Quick Dialogs QML Types
     \ingroup qmlmodules
     \brief Provides QML types for standard file, color picker and message dialogs
 
diff --git a/src/imports/dialogs/qquickplatformcolordialog.cpp b/src/imports/dialogs/qquickplatformcolordialog.cpp
index 491a2e6..ea3114c 100644
--- a/src/imports/dialogs/qquickplatformcolordialog.cpp
+++ b/src/imports/dialogs/qquickplatformcolordialog.cpp
@@ -53,7 +53,7 @@ QT_BEGIN_NAMESPACE
     \qmltype ColorDialog
     \instantiates QQuickPlatformColorDialog
     \inqmlmodule QtQuick.Dialogs 1
-    \ingroup qtquick-visual
+    \ingroup dialogs
     \brief Dialog component for choosing a color.
     \since Qt 5.1
 
diff --git a/src/imports/dialogs/qquickplatformfiledialog.cpp b/src/imports/dialogs/qquickplatformfiledialog.cpp
index d767f65..5ae7fd0 100644
--- a/src/imports/dialogs/qquickplatformfiledialog.cpp
+++ b/src/imports/dialogs/qquickplatformfiledialog.cpp
@@ -53,7 +53,7 @@ QT_BEGIN_NAMESPACE
     \qmltype FileDialog
     \instantiates QQuickPlatformFileDialog
     \inqmlmodule QtQuick.Dialogs 1
-    \ingroup qtquick-visual
+    \ingroup dialogs
     \brief Dialog component for choosing files from a local filesystem.
     \since Qt 5.1
 
diff --git a/src/quick/doc/src/qtquick.qdoc b/src/quick/doc/src/qtquick.qdoc
index cafe10d..7163baa 100644
--- a/src/quick/doc/src/qtquick.qdoc
+++ b/src/quick/doc/src/qtquick.qdoc
@@ -125,6 +125,8 @@ Additional Qt Quick information:
     system for Qt Quick
     \li \l{QtQuick.Window 2}{Window} - contains types for creating
     top-level windows and accessing screen information
+    \li \l{QtQuick.Dialogs 1}{Dialogs} - contains types for creating and
+    interacting with system dialogs
     \endlist
 \li \l{Qt Quick Release Notes} - list of changes and additions in the Qt Quick
 \li \l{Qt Quick Code Samples} - list of all Qt Quick examples