Doc: Replaced the module name qualifier used for QML docs

Also made changes to avoid qdoc warnings about qml snippets.

Change-Id: Ide047fe7a4901fcf4b03efdccf457662e60585d2
Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>

5 files changed, 35 insertions, 34 deletions

diff --git a/src/imports/controls/doc/src/qtquickcontrols2-index.qdoc b/src/imports/controls/doc/src/qtquickcontrols2-index.qdoc
index e9027a5d..3c76a202 100644
--- a/src/imports/controls/doc/src/qtquickcontrols2-index.qdoc
+++ b/src/imports/controls/doc/src/qtquickcontrols2-index.qdoc
@@ -90,7 +90,7 @@
     ScrollView {
         horizontalScrollBarPolicy: Qt.ScrollBarAlwaysOff
         Flickable {
-            ...
+            // ...
         }
     }
     \endqml
@@ -100,7 +100,7 @@
 
     \qml
     Flickable {
-        ...
+        // ...
         ScrollBar.vertical: ScrollBar { }
     }
     \endqml
@@ -162,7 +162,7 @@
     Button {
         style: ButtonStyle {
             label: Label {
-                ...
+                // ...
             }
         }
     }
@@ -173,7 +173,7 @@
     \qml
     Button {
         label: Label {
-            ...
+            // ...
         }
     }
     \endqml
diff --git a/src/imports/controls/qquickdial.cpp b/src/imports/controls/qquickdial.cpp
index c607fba3..4bc62f02 100644
--- a/src/imports/controls/qquickdial.cpp
+++ b/src/imports/controls/qquickdial.cpp
@@ -168,7 +168,7 @@ QQuickDial::QQuickDial(QQuickItem *parent) :
 }
 
 /*!
-    \qmlproperty real QtQuickControls2::Dial::from
+    \qmlproperty real QtQuick.Controls::Dial::from
 
     This property holds the starting value for the range. The default value is \c 0.0.
 
@@ -194,7 +194,7 @@ void QQuickDial::setFrom(qreal from)
 }
 
 /*!
-    \qmlproperty real QtQuickControls2::Dial::to
+    \qmlproperty real QtQuick.Controls::Dial::to
 
     This property holds the end value for the range. The default value is
     \c 1.0.
@@ -221,7 +221,7 @@ void QQuickDial::setTo(qreal to)
 }
 
 /*!
-    \qmlproperty real QtQuickControls2::Dial::value
+    \qmlproperty real QtQuick.Controls::Dial::value
 
     This property holds the value in the range \c from - \c to. The default
     value is \c 0.0.
@@ -252,7 +252,7 @@ void QQuickDial::setValue(qreal value)
 }
 
 /*!
-    \qmlproperty real QtQuickControls2::Dial::position
+    \qmlproperty real QtQuick.Controls::Dial::position
 
     This property holds the logical position of the handle.
 
@@ -270,7 +270,7 @@ qreal QQuickDial::position() const
 }
 
 /*!
-    \qmlproperty real QtQuickControls2::Dial::angle \readonly
+    \qmlproperty real QtQuick.Controls::Dial::angle \readonly
 
     This property holds the angle of the handle.
 
@@ -286,7 +286,7 @@ qreal QQuickDial::angle() const
 }
 
 /*!
-    \qmlproperty real QtQuickControls2::Dial::stepSize
+    \qmlproperty real QtQuick.Controls::Dial::stepSize
 
     This property holds the step size. The default value is \c 0.0.
 
@@ -308,7 +308,7 @@ void QQuickDial::setStepSize(qreal step)
 }
 
 /*!
-    \qmlproperty enumeration QtQuickControls2::Dial::snapMode
+    \qmlproperty enumeration QtQuick.Controls::Dial::snapMode
 
     This property holds the snap mode.
 
@@ -340,7 +340,7 @@ void QQuickDial::setSnapMode(SnapMode mode)
 }
 
 /*!
-    \qmlproperty bool QtQuickControls2::Dial::pressed
+    \qmlproperty bool QtQuick.Controls::Dial::pressed
 
     This property holds whether the dial is pressed.
 
@@ -374,7 +374,7 @@ void QQuickDial::setPressed(bool pressed)
 }
 
 /*!
-    \qmlmethod void QtQuickControls2::Dial::increase()
+    \qmlmethod void QtQuick.Controls::Dial::increase()
 
     Increases the value by \l stepSize, or \c 0.1 if stepSize is not defined.
 
@@ -388,7 +388,7 @@ void QQuickDial::increase()
 }
 
 /*!
-    \qmlmethod void QtQuickControls2::Dial::decrease()
+    \qmlmethod void QtQuick.Controls::Dial::decrease()
 
     Decreases the value by \l stepSize, or \c 0.1 if stepSize is not defined.
 
@@ -402,7 +402,7 @@ void QQuickDial::decrease()
 }
 
 /*!
-    \qmlproperty component QtQuickControls2::Dial::handle
+    \qmlproperty component QtQuick.Controls::Dial::handle
 
     This property holds the handle of the dial.
 
diff --git a/src/imports/controls/qquickswipeview.cpp b/src/imports/controls/qquickswipeview.cpp
index f86e8c8c..c0def1c8 100644
--- a/src/imports/controls/qquickswipeview.cpp
+++ b/src/imports/controls/qquickswipeview.cpp
@@ -149,7 +149,7 @@ void QQuickSwipeView::contentItemChange(QQuickItem *newItem, QQuickItem *oldItem
 }
 
 /*!
-    \qmlattachedproperty int QtQuickControls2::SwipeView::index
+    \qmlattachedproperty int QtQuick.Controls::SwipeView::index
 
     This attached property holds the index of each child item in the SwipeView.
 
@@ -157,7 +157,7 @@ void QQuickSwipeView::contentItemChange(QQuickItem *newItem, QQuickItem *oldItem
 */
 
 /*!
-    \qmlattachedproperty bool QtQuickControls2::SwipeView::isCurrentItem
+    \qmlattachedproperty bool QtQuick.Controls::SwipeView::isCurrentItem
 
     This attached property is \c true if this child is the current item.
 
@@ -165,7 +165,7 @@ void QQuickSwipeView::contentItemChange(QQuickItem *newItem, QQuickItem *oldItem
 */
 
 /*!
-    \qmlattachedproperty SwipeView QtQuickControls2::SwipeView::view
+    \qmlattachedproperty SwipeView QtQuick.Controls::SwipeView::view
 
     This attached property holds the view that manages this child item.
 
diff --git a/src/imports/controls/qquicktheme.cpp b/src/imports/controls/qquicktheme.cpp
index c404dac8..3cfbc689 100644
--- a/src/imports/controls/qquicktheme.cpp
+++ b/src/imports/controls/qquicktheme.cpp
@@ -59,43 +59,43 @@ QT_BEGIN_NAMESPACE
 */
 
 /*!
-    \qmlattachedproperty color QtQuickControls2::Theme::accentColor
+    \qmlattachedproperty color QtQuick.Controls::Theme::accentColor
 */
 
 /*!
-    \qmlattachedproperty color QtQuickControls2::Theme::backgroundColor
+    \qmlattachedproperty color QtQuick.Controls::Theme::backgroundColor
 */
 
 /*!
-    \qmlattachedproperty color QtQuickControls2::Theme::disabledColor
+    \qmlattachedproperty color QtQuick.Controls::Theme::disabledColor
 */
 
 /*!
-    \qmlattachedproperty color QtQuickControls2::Theme::focusColor
+    \qmlattachedproperty color QtQuick.Controls::Theme::focusColor
 */
 
 /*!
-    \qmlattachedproperty color QtQuickControls2::Theme::frameColor
+    \qmlattachedproperty color QtQuick.Controls::Theme::frameColor
 */
 
 /*!
-    \qmlattachedproperty color QtQuickControls2::Theme::pressColor
+    \qmlattachedproperty color QtQuick.Controls::Theme::pressColor
 */
 
 /*!
-    \qmlattachedproperty color QtQuickControls2::Theme::selectedTextColor
+    \qmlattachedproperty color QtQuick.Controls::Theme::selectedTextColor
 */
 
 /*!
-    \qmlattachedproperty color QtQuickControls2::Theme::selectionColor
+    \qmlattachedproperty color QtQuick.Controls::Theme::selectionColor
 */
 
 /*!
-    \qmlattachedproperty color QtQuickControls2::Theme::shadowColor
+    \qmlattachedproperty color QtQuick.Controls::Theme::shadowColor
 */
 
 /*!
-    \qmlattachedproperty color QtQuickControls2::Theme::textColor
+    \qmlattachedproperty color QtQuick.Controls::Theme::textColor
 */
 
 Q_GLOBAL_STATIC_WITH_ARGS(QQuickThemeData, globalThemeData, (QString::fromLatin1(":/qtquickcontrols/theme.json")))
diff --git a/src/imports/controls/qquicktumbler.cpp b/src/imports/controls/qquicktumbler.cpp
index 9f53f92e..73358b75 100644
--- a/src/imports/controls/qquicktumbler.cpp
+++ b/src/imports/controls/qquicktumbler.cpp
@@ -52,6 +52,7 @@ QT_BEGIN_NAMESPACE
     \code
     Tumbler {
         model: 5
+        // ...
     }
     \endcode
 
@@ -193,7 +194,7 @@ QQuickTumbler::~QQuickTumbler()
 }
 
 /*!
-    \qmlproperty variant QtQuickControls2::Tumbler::model
+    \qmlproperty variant QtQuick.Controls::Tumbler::model
 
     This property holds the model that provides data for this tumbler.
 */
@@ -213,7 +214,7 @@ void QQuickTumbler::setModel(const QVariant &model)
 }
 
 /*!
-    \qmlproperty int QtQuickControls2::Tumbler::count
+    \qmlproperty int QtQuick.Controls::Tumbler::count
 
     This property holds the number of items in the model.
 */
@@ -224,7 +225,7 @@ int QQuickTumbler::count() const
 }
 
 /*!
-    \qmlproperty int QtQuickControls2::Tumbler::currentIndex
+    \qmlproperty int QtQuick.Controls::Tumbler::currentIndex
 
     This property holds the index of the current item.
 */
@@ -241,7 +242,7 @@ void QQuickTumbler::setCurrentIndex(int currentIndex)
 }
 
 /*!
-    \qmlproperty Item QtQuickControls2::Tumbler::currentItem
+    \qmlproperty Item QtQuick.Controls::Tumbler::currentItem
 
     This property holds the item at the current index.
 */
@@ -252,7 +253,7 @@ QQuickItem *QQuickTumbler::currentItem() const
 }
 
 /*!
-    \qmlproperty component QtQuickControls2::Tumbler::delegate
+    \qmlproperty component QtQuick.Controls::Tumbler::delegate
 
     This property holds the delegate used to display each item.
 */
@@ -272,7 +273,7 @@ void QQuickTumbler::setDelegate(QQmlComponent *delegate)
 }
 
 /*!
-    \qmlproperty int QtQuickControls2::Tumbler::visibleItemCount
+    \qmlproperty int QtQuick.Controls::Tumbler::visibleItemCount
 
     This property holds the number of items visible in the tumbler. It must be
     an odd number, as the current item is always vertically centered.