aboutsummaryrefslogtreecommitdiffstats
path: root/src/imports/controls/doc/src
diff options
context:
space:
mode:
authorJ-P Nurmi <jpnurmi@qt.io>2016-04-21 16:56:59 +0200
committerJ-P Nurmi <jpnurmi@qt.io>2016-04-21 18:08:46 +0000
commit523542d5241392ac258b02271f20c0be310cd1e5 (patch)
treef856d27d7c569fa2ee129116af032dc7a04a18b1 /src/imports/controls/doc/src
parent2298df331b7d5922e480533d65e4d5d7861b2be9 (diff)
Doc: rename Qt.labs.controls 1.0 to QtQuick.Controls 2.0
Change-Id: Id6c476424fa359d222f027584278346fc0984069 Task-number: QTBUG-52549 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
Diffstat (limited to 'src/imports/controls/doc/src')
-rw-r--r--src/imports/controls/doc/src/qtquickcontrols2-deployment.qdoc4
-rw-r--r--src/imports/controls/doc/src/qtquickcontrols2-index.qdoc4
-rw-r--r--src/imports/controls/doc/src/qtquickcontrols2-material.qdoc2
-rw-r--r--src/imports/controls/doc/src/qtquickcontrols2-qmltypes.qdoc6
-rw-r--r--src/imports/controls/doc/src/qtquickcontrols2-universal.qdoc2
-rw-r--r--src/imports/controls/doc/src/templates/qtquicktemplates2.qdoc8
6 files changed, 13 insertions, 13 deletions
diff --git a/src/imports/controls/doc/src/qtquickcontrols2-deployment.qdoc b/src/imports/controls/doc/src/qtquickcontrols2-deployment.qdoc
index 3d944485..51a9b613 100644
--- a/src/imports/controls/doc/src/qtquickcontrols2-deployment.qdoc
+++ b/src/imports/controls/doc/src/qtquickcontrols2-deployment.qdoc
@@ -50,8 +50,8 @@
+android/qtquickcontrols2.conf
\endcode
- In the project above, \c main.qml would import \c Qt.labs.controls, for
- example, but shouldn't import, say, \c Qt.labs.controls.material. Any code
+ In the project above, \c main.qml would import \c QtQuick.Controls, for
+ example, but shouldn't import, say, \c QtQuick.Controls.Material. Any code
that is style-specific is moved out into separate files; just as we've done
for \c MyPage.qml.
diff --git a/src/imports/controls/doc/src/qtquickcontrols2-index.qdoc b/src/imports/controls/doc/src/qtquickcontrols2-index.qdoc
index 785c70de..00e16679 100644
--- a/src/imports/controls/doc/src/qtquickcontrols2-index.qdoc
+++ b/src/imports/controls/doc/src/qtquickcontrols2-index.qdoc
@@ -64,8 +64,8 @@
\section1 QML Types
- \section2 Qt.labs.controls Module
- \generatelist {qmltypesbymodule Qt.labs.controls}
+ \section2 QtQuick.Controls Module
+ \generatelist {qmltypesbymodule QtQuick.Controls}
\section1 Important Concepts in Qt Quick Controls 2
diff --git a/src/imports/controls/doc/src/qtquickcontrols2-material.qdoc b/src/imports/controls/doc/src/qtquickcontrols2-material.qdoc
index 5b425741..7c9e27ab 100644
--- a/src/imports/controls/doc/src/qtquickcontrols2-material.qdoc
+++ b/src/imports/controls/doc/src/qtquickcontrols2-material.qdoc
@@ -32,7 +32,7 @@
The Material Style is based on the Google Material Design Guidelines.
\l {detailed-description}{More...}
- \styleimport {Qt.labs.controls.material 1.0}
+ \styleimport {QtQuick.Controls.Material 2.0}
\section1 Attached Properties
diff --git a/src/imports/controls/doc/src/qtquickcontrols2-qmltypes.qdoc b/src/imports/controls/doc/src/qtquickcontrols2-qmltypes.qdoc
index 507c3a0f..deff846d 100644
--- a/src/imports/controls/doc/src/qtquickcontrols2-qmltypes.qdoc
+++ b/src/imports/controls/doc/src/qtquickcontrols2-qmltypes.qdoc
@@ -26,7 +26,7 @@
****************************************************************************/
/*!
- \qmlmodule Qt.labs.controls 1.0
+ \qmlmodule QtQuick.Controls 2.0
\title Qt Quick Controls 2 QML Types
\ingroup qmlmodules
\brief Provides QML types for user interfaces (Qt Quick Controls 2).
@@ -53,8 +53,8 @@
\section1 QML Types
- \section2 Qt.labs.controls Module
- \generatelist {qmltypesbymodule Qt.labs.controls}
+ \section2 QtQuick.Controls Module
+ \generatelist {qmltypesbymodule QtQuick.Controls}
\noautolist
For more information on the Qt Quick Controls 2 module, see the
diff --git a/src/imports/controls/doc/src/qtquickcontrols2-universal.qdoc b/src/imports/controls/doc/src/qtquickcontrols2-universal.qdoc
index 4ed13d75..a1803409 100644
--- a/src/imports/controls/doc/src/qtquickcontrols2-universal.qdoc
+++ b/src/imports/controls/doc/src/qtquickcontrols2-universal.qdoc
@@ -32,7 +32,7 @@
The Universal Style is based on the Microsoft Universal Design Guidelines.
\l {detailed-description}{More...}
- \styleimport {Qt.labs.controls.universal 1.0}
+ \styleimport {QtQuick.Controls.Universal 2.0}
\section1 Attached Properties
diff --git a/src/imports/controls/doc/src/templates/qtquicktemplates2.qdoc b/src/imports/controls/doc/src/templates/qtquicktemplates2.qdoc
index 335b4705..0c1dd008 100644
--- a/src/imports/controls/doc/src/templates/qtquicktemplates2.qdoc
+++ b/src/imports/controls/doc/src/templates/qtquicktemplates2.qdoc
@@ -44,16 +44,16 @@
\labs
For the sake of clarity, there is a one-to-one mapping between the types
- provided by the \c Qt.labs.templates and \c Qt.labs.controls imports. For
- every type available in the \c Qt.labs.controls import, a non-visual template
+ provided by the \c Qt.labs.templates and \c QtQuick.Controls imports. For
+ every type available in the \c QtQuick.Controls import, a non-visual template
type by the same name exists in the \c Qt.labs.templates import.
\note It is recommended to use a namespace for the templates import to avoid
- overlap with the types provided by the \c Qt.labs.controls import.
+ overlap with the types provided by the \c QtQuick.Controls import.
\section1 QML Types
- \generatelist {qmltypesbymodule Qt.labs.controls}
+ \generatelist {qmltypesbymodule QtQuick.Controls}
\section1 Related Information