summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTopi Reinio <topi.reinio@theqtcompany.com>2016-04-22 11:25:23 +0200
committerTopi Reiniƶ <topi.reinio@theqtcompany.com>2016-04-28 07:20:14 +0000
commitd1f118d8b6811b08d2057e110dc24d3292736dd6 (patch)
tree4d228f723160f34d2e2136c6d8b68d194e1186e8
parentf1db93bc3324b8ef222c9815ca38c08f97bc0b94 (diff)
downloadqtquickcontrols-d1f118d8b6811b08d2057e110dc24d3292736dd6.tar.gz
Doc: Rename conflicting group
A group name 'dialogs' conflicts with a page elsewhere in the documentation. Renamed to be more specific, and removed the \group command - it's not required for generating annotated lists, and was not linked to. Change-Id: I571702ece13d5eb57a984cec47811b7d58cc0121 Reviewed-by: Shawn Rutledge <shawn.rutledge@theqtcompany.com> Reviewed-by: Venugopal Shivashankar <venugopal.shivashankar@digia.com>
-rw-r--r--src/dialogs/doc/src/qtquickdialogs-index.qdoc8
-rw-r--r--src/dialogs/qquickdialog.cpp2
-rw-r--r--src/dialogs/qquickplatformcolordialog.cpp2
-rw-r--r--src/dialogs/qquickplatformfiledialog.cpp2
-rw-r--r--src/dialogs/qquickplatformfontdialog.cpp2
-rw-r--r--src/dialogs/qquickplatformmessagedialog.cpp2
6 files changed, 6 insertions, 12 deletions
diff --git a/src/dialogs/doc/src/qtquickdialogs-index.qdoc b/src/dialogs/doc/src/qtquickdialogs-index.qdoc
index b7a8e671..a0181097 100644
--- a/src/dialogs/doc/src/qtquickdialogs-index.qdoc
+++ b/src/dialogs/doc/src/qtquickdialogs-index.qdoc
@@ -26,12 +26,6 @@
****************************************************************************/
/*!
- \group dialogs
- \brief Dialog components
- \title Dialogs
-*/
-
-/*!
\page qtquickdialogs-index.html
\title Qt Quick Dialogs
@@ -41,7 +35,7 @@
\section1 Dialogs
- \annotatedlist dialogs
+ \annotatedlist qtquickdialogs
\section1 Related information
diff --git a/src/dialogs/qquickdialog.cpp b/src/dialogs/qquickdialog.cpp
index 6a4a0721..8e92810c 100644
--- a/src/dialogs/qquickdialog.cpp
+++ b/src/dialogs/qquickdialog.cpp
@@ -46,7 +46,7 @@ QT_BEGIN_NAMESPACE
\qmltype Dialog
\instantiates QQuickDialog
\inqmlmodule QtQuick.Dialogs
- \ingroup dialogs
+ \ingroup qtquickdialogs
\brief A generic QtQuick dialog wrapper with standard buttons.
\since 5.3
diff --git a/src/dialogs/qquickplatformcolordialog.cpp b/src/dialogs/qquickplatformcolordialog.cpp
index e98bc03a..f1011769 100644
--- a/src/dialogs/qquickplatformcolordialog.cpp
+++ b/src/dialogs/qquickplatformcolordialog.cpp
@@ -48,7 +48,7 @@ QT_BEGIN_NAMESPACE
\qmltype ColorDialog
\instantiates QQuickPlatformColorDialog
\inqmlmodule QtQuick.Dialogs
- \ingroup dialogs
+ \ingroup qtquickdialogs
\brief Dialog component for choosing a color.
\since 5.1
diff --git a/src/dialogs/qquickplatformfiledialog.cpp b/src/dialogs/qquickplatformfiledialog.cpp
index ab9ba72d..2f200b80 100644
--- a/src/dialogs/qquickplatformfiledialog.cpp
+++ b/src/dialogs/qquickplatformfiledialog.cpp
@@ -48,7 +48,7 @@ QT_BEGIN_NAMESPACE
\qmltype FileDialog
\instantiates QQuickPlatformFileDialog
\inqmlmodule QtQuick.Dialogs
- \ingroup dialogs
+ \ingroup qtquickdialogs
\brief Dialog component for choosing files from a local filesystem.
\since 5.1
diff --git a/src/dialogs/qquickplatformfontdialog.cpp b/src/dialogs/qquickplatformfontdialog.cpp
index 8b93fd1d..575de880 100644
--- a/src/dialogs/qquickplatformfontdialog.cpp
+++ b/src/dialogs/qquickplatformfontdialog.cpp
@@ -49,7 +49,7 @@ QT_BEGIN_NAMESPACE
\instantiates QQuickPlatformFontDialog
\inqmlmodule QtQuick.Dialogs
\ingroup qtquick-visual
- \ingroup dialogs
+ \ingroup qtquickdialogs
\brief Dialog component for choosing a font.
\since 5.2
diff --git a/src/dialogs/qquickplatformmessagedialog.cpp b/src/dialogs/qquickplatformmessagedialog.cpp
index 9413a98f..76b2ce93 100644
--- a/src/dialogs/qquickplatformmessagedialog.cpp
+++ b/src/dialogs/qquickplatformmessagedialog.cpp
@@ -48,7 +48,7 @@ QT_BEGIN_NAMESPACE
\qmltype MessageDialog
\instantiates QQuickPlatformMessageDialog
\inqmlmodule QtQuick.Dialogs
- \ingroup dialogs
+ \ingroup qtquickdialogs
\brief Dialog component for displaying popup messages.
\since 5.2