summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCaroline Chao <caroline.chao@digia.com>2013-09-19 14:15:44 +0200
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-09-26 15:29:34 +0200
commit6cfe20fc66c2d7e9daf07cb77fa781e284f13e0a (patch)
tree5eb0a0293f28dbbf47246343030a5b717aaf2a0e
parentc21bc7749fb2331d92bf5c109c9225583d882582 (diff)
Doc: Fix versions in \qmlmodule and \inqmlmodule
In the future qdoc will ignore the version in \inqmlmodule. Task-number: QTBUG-33555 Change-Id: I6bec55d33bc50db9639e48fe3017a634a4bbc671 Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
-rw-r--r--src/controls/Private/BasicButton.qml2
-rw-r--r--src/controls/Private/Control.qml2
-rw-r--r--src/controls/Private/FocusFrame.qml2
-rw-r--r--src/controls/Private/ModalPopupBehavior.qml2
-rw-r--r--src/controls/Private/ScrollBar.qml2
-rw-r--r--src/controls/Private/ScrollViewHelper.qml2
-rw-r--r--src/controls/Private/StackViewSlideDelegate.qml2
-rw-r--r--src/controls/Private/Style.qml2
-rw-r--r--src/controls/Private/TabBar.qml2
-rw-r--r--src/controls/Styles/Base/BusyIndicatorStyle.qml2
-rw-r--r--src/controls/doc/src/qtquickcontrols.qdoc2
-rw-r--r--src/controls/doc/src/qtquickcontrolsstyles-index.qdoc2
-rw-r--r--src/controls/qquickexclusivegroup.cpp2
13 files changed, 13 insertions, 13 deletions
diff --git a/src/controls/Private/BasicButton.qml b/src/controls/Private/BasicButton.qml
index e2879cf54..f20d476f9 100644
--- a/src/controls/Private/BasicButton.qml
+++ b/src/controls/Private/BasicButton.qml
@@ -47,7 +47,7 @@ import QtQuick.Controls.Styles 1.1
\qmltype BasicButton
\internal
\qmlabstract
- \inqmlmodule QtQuick.Controls.Private 1.0
+ \inqmlmodule QtQuick.Controls.Private
*/
Control {
diff --git a/src/controls/Private/Control.qml b/src/controls/Private/Control.qml
index f2b234fd8..0ce8908fb 100644
--- a/src/controls/Private/Control.qml
+++ b/src/controls/Private/Control.qml
@@ -44,7 +44,7 @@ import QtQuick.Controls.Styles 1.1
\qmltype Control
\internal
\qmlabstract
- \inqmlmodule QtQuick.Controls.Private 1.0
+ \inqmlmodule QtQuick.Controls.Private
*/
FocusScope {
id: root
diff --git a/src/controls/Private/FocusFrame.qml b/src/controls/Private/FocusFrame.qml
index c81ef11fb..449d06b1a 100644
--- a/src/controls/Private/FocusFrame.qml
+++ b/src/controls/Private/FocusFrame.qml
@@ -45,7 +45,7 @@ import QtQuick.Controls.Private 1.0
/*!
\qmltype FocusFrame
\internal
- \inqmlmodule QtQuick.Controls.Private 1.0
+ \inqmlmodule QtQuick.Controls.Private
*/
Item {
id: root
diff --git a/src/controls/Private/ModalPopupBehavior.qml b/src/controls/Private/ModalPopupBehavior.qml
index 1c6db2ff1..8b78cb31b 100644
--- a/src/controls/Private/ModalPopupBehavior.qml
+++ b/src/controls/Private/ModalPopupBehavior.qml
@@ -46,7 +46,7 @@ import QtQuick 2.1
/*!
\qmltype ModalPopupBehavior
\internal
- \inqmlmodule QtQuick.Controls.Private 1.0
+ \inqmlmodule QtQuick.Controls.Private
*/
Item {
id: popupBehavior
diff --git a/src/controls/Private/ScrollBar.qml b/src/controls/Private/ScrollBar.qml
index 49dd20a40..65ed51cfc 100644
--- a/src/controls/Private/ScrollBar.qml
+++ b/src/controls/Private/ScrollBar.qml
@@ -45,7 +45,7 @@ import QtQuick.Controls.Private 1.0
/*!
\qmltype ScrollBar
\internal
- \inqmlmodule QtQuick.Controls.Private 1.0
+ \inqmlmodule QtQuick.Controls.Private
*/
Item {
id: scrollbar
diff --git a/src/controls/Private/ScrollViewHelper.qml b/src/controls/Private/ScrollViewHelper.qml
index af3f87937..3f1166f3e 100644
--- a/src/controls/Private/ScrollViewHelper.qml
+++ b/src/controls/Private/ScrollViewHelper.qml
@@ -45,7 +45,7 @@ import QtQuick.Controls.Private 1.0
/*!
\qmltype ScrollViewHeader
\internal
- \inqmlmodule QtQuick.Controls.Private 1.0
+ \inqmlmodule QtQuick.Controls.Private
*/
Item {
id: wheelarea
diff --git a/src/controls/Private/StackViewSlideDelegate.qml b/src/controls/Private/StackViewSlideDelegate.qml
index 2d9a8c9a6..88530e696 100644
--- a/src/controls/Private/StackViewSlideDelegate.qml
+++ b/src/controls/Private/StackViewSlideDelegate.qml
@@ -44,7 +44,7 @@ import QtQuick.Controls 1.1
/*!
\qmltype StackViewSlideTransition
\internal
- \inqmlmodule QtQuick.Controls.Private 1.0
+ \inqmlmodule QtQuick.Controls.Private
*/
StackViewDelegate {
id: root
diff --git a/src/controls/Private/Style.qml b/src/controls/Private/Style.qml
index b06e0a3de..ed31536dd 100644
--- a/src/controls/Private/Style.qml
+++ b/src/controls/Private/Style.qml
@@ -44,7 +44,7 @@ import QtQuick.Controls.Private 1.0
/*!
\qmltype Style
\internal
- \inqmlmodule QtQuick.Controls.Private 1.0
+ \inqmlmodule QtQuick.Controls.Private
*/
AbstractStyle {
diff --git a/src/controls/Private/TabBar.qml b/src/controls/Private/TabBar.qml
index 1edc5575e..592ec3480 100644
--- a/src/controls/Private/TabBar.qml
+++ b/src/controls/Private/TabBar.qml
@@ -44,7 +44,7 @@ import QtQuick.Controls 1.1
/*!
\qmltype TabBar
\internal
- \inqmlmodule QtQuick.Controls.Private 1.0
+ \inqmlmodule QtQuick.Controls.Private
*/
FocusScope {
id: tabbar
diff --git a/src/controls/Styles/Base/BusyIndicatorStyle.qml b/src/controls/Styles/Base/BusyIndicatorStyle.qml
index e03748833..fb62def8c 100644
--- a/src/controls/Styles/Base/BusyIndicatorStyle.qml
+++ b/src/controls/Styles/Base/BusyIndicatorStyle.qml
@@ -43,7 +43,7 @@ import QtQuick.Controls.Private 1.0
/*!
\qmltype BusyIndicatorStyle
- \inqmlmodule QtQuick.Controls.Styles 1.1
+ \inqmlmodule QtQuick.Controls.Styles
\since QtQuick.Controls.Styles 1.1
\ingroup controlsstyling
\brief Provides custom styling for BusyIndicatorStyle
diff --git a/src/controls/doc/src/qtquickcontrols.qdoc b/src/controls/doc/src/qtquickcontrols.qdoc
index 7b161bd1a..05d9593a8 100644
--- a/src/controls/doc/src/qtquickcontrols.qdoc
+++ b/src/controls/doc/src/qtquickcontrols.qdoc
@@ -26,7 +26,7 @@
****************************************************************************/
/*!
- \qmlmodule QtQuick.Controls 1
+ \qmlmodule QtQuick.Controls 1.1
\title Qt Quick Controls QML Types
\ingroup qmlmodules
\brief Provides QML types for user interfaces.
diff --git a/src/controls/doc/src/qtquickcontrolsstyles-index.qdoc b/src/controls/doc/src/qtquickcontrolsstyles-index.qdoc
index 15678329b..61c33cd67 100644
--- a/src/controls/doc/src/qtquickcontrolsstyles-index.qdoc
+++ b/src/controls/doc/src/qtquickcontrolsstyles-index.qdoc
@@ -95,7 +95,7 @@
*/
/*!
- \qmlmodule QtQuick.Controls.Styles 1
+ \qmlmodule QtQuick.Controls.Styles 1.1
\title Qt Quick Controls Styles QML Types
\ingroup qmlmodules
\brief Provides QML types for Qt Quick Controls styles.
diff --git a/src/controls/qquickexclusivegroup.cpp b/src/controls/qquickexclusivegroup.cpp
index a512bc34d..bf7a38440 100644
--- a/src/controls/qquickexclusivegroup.cpp
+++ b/src/controls/qquickexclusivegroup.cpp
@@ -67,7 +67,7 @@ static bool isChecked(const QObject *o)
\qmltype ExclusiveGroup
\instantiates QQuickExclusiveGroup
\ingroup controls
- \inqmlmodule QtQuick.Controls 1.0
+ \inqmlmodule QtQuick.Controls
\brief ExclusiveGroup provides a way to declare several checkable controls as mutually exclusive.
ExclusiveGroup can contain several \l Action items, and those will automatically get their