aboutsummaryrefslogtreecommitdiffstats
path: root/examples
diff options
context:
space:
mode:
authorNico Vertriest <nico.vertriest@theqtcompany.com>2016-04-04 12:29:07 +0200
committerNico Vertriest <nico.vertriest@theqtcompany.com>2016-04-07 08:37:14 +0000
commita57044f211dffdfac76102ec3d9d37c6f860ddd3 (patch)
treebc30b4e55dc0594fc0042ec8d60b134690bc948e /examples
parentf6fabcf636d9a1c31a2572a2d3ee01b4beaf7240 (diff)
Doc: Rename Qt Labs Controls to Qt Quick Controls 2
Replaced all remaining instances of "Qt Labs Controls" Change-Id: Iab8ca27d98a16a7c99bd364c66efc8b98d93eacc Reviewed-by: Topi Reiniƶ <topi.reinio@theqtcompany.com> Reviewed-by: Martin Smith <martin.smith@theqtcompany.com>
Diffstat (limited to 'examples')
-rw-r--r--examples/controls/chattutorial/doc/src/qtquickcontrols2-chattutorial.qdoc (renamed from examples/controls/chattutorial/doc/src/qtlabscontrols-chattutorial.qdoc)28
-rw-r--r--examples/controls/gallery/doc/src/qtquickcontrols-gallery.qdoc6
-rw-r--r--examples/controls/gallery/gallery.qml6
3 files changed, 20 insertions, 20 deletions
diff --git a/examples/controls/chattutorial/doc/src/qtlabscontrols-chattutorial.qdoc b/examples/controls/chattutorial/doc/src/qtquickcontrols2-chattutorial.qdoc
index 53931f42..f4fc9f70 100644
--- a/examples/controls/chattutorial/doc/src/qtlabscontrols-chattutorial.qdoc
+++ b/examples/controls/chattutorial/doc/src/qtquickcontrols2-chattutorial.qdoc
@@ -27,12 +27,12 @@
/*!
\example chattutorial
-\title Qt Labs Controls - Chat Tutorial
-\brief Tutorial about writing a basic chat client using Qt Labs Controls.
-\ingroup qtlabscontrols-examples
+\title Qt Quick Controls 2 - Chat Tutorial
+\brief Tutorial about writing a basic chat client using Qt Quick Controls 2.
+\ingroup qtquickcontrols2-examples
-This tutorial shows how to write a basic chat application using Qt Labs
-Controls. It will also explain how to integrate an SQL database into a Qt
+This tutorial shows how to write a basic chat application using Qt Quick
+Controls 2. It will also explain how to integrate an SQL database into a Qt
application.
\section1 Chapter 1: Setting Up
@@ -74,7 +74,7 @@ arguments provided by the user.
Next, the QML engine is created. \l QQmlApplicationEngine is a convenient
wrapper over QQmlEngine, providing the \l {QQmlApplicationEngine::load}{load()}
function to easily load QML for an application. It also adds some convenience
-for using \l {Using File Selectors with Qt Labs Controls}{file selectors}.
+for using \l {Using File Selectors with Qt Quick Controls 2}{file selectors}.
Once we've set up things in C++, we can move on to the user interface in QML.
@@ -89,7 +89,7 @@ access to graphical primitives such as \l Item, \l Rectangle, \l Text, and so
on.
For the full list of types, see the \l {Qt Quick QML Types} documentation.
-Next, we import the Qt Labs Controls module. Amongst other things, this
+Next, we import the Qt Quick Controls 2 module. Amongst other things, this
makes \l ApplicationWindow available:
\skipto ApplicationWindow
@@ -127,7 +127,7 @@ how to navigate between several pages.
Now that we have a Page, we can assign a \l Label to its \l {Page::}{header}
property. Label extends the primitive \l Text item from the Qt Quick module by
-adding \l {Styling Qt Labs Controls}{styling} and \l {Control::}{font}
+adding \l {Styling Qt Quick Controls 2}{styling} and \l {Control::}{font}
inheritance. This means that a Label can look different depending on which
style is in use, and can also propagate its pixel size to its children.
@@ -196,7 +196,7 @@ In this chapter, we'll explain how to create a list of interactive items using
ListView comes from the Qt Quick module, and displays a list of items
populated from a \l {Models and Views in Qt Quick}{model}. ItemDelegate comes from
-the Qt Labs Controls module, and provides a standard view item for use in views
+the Qt Quick Controls 2 module, and provides a standard view item for use in views
and controls such as ListView and \l ComboBox. For example, each ItemDelegate
can display text, be checked on and off, and react to mouse clicks.
@@ -708,7 +708,7 @@ text field to make way for future input.
\section1 Chapter 5: Styling
-Styles in Qt Labs Controls are designed to work on any platform. In this
+Styles in Qt Quick Controls 2 are designed to work on any platform. In this
chapter, we'll do some minor visual tweaks to make sure our application
looks good when run with the \l {Default Style}{Default},
\l {Material Style}{Material}, and \l {Universal Style}{Universal} styles.
@@ -746,8 +746,8 @@ Material style plugin \e must be deployed with the application, even if the
target device doesn't use it, otherwise the QML engine will fail to find the
import.
-Instead, it is better to rely on Qt Labs Controls' built-in support for
-\l {Using File Selectors with Qt Labs Controls}{style-based file selectors}.
+Instead, it is better to rely on Qt Quick Controls 2's built-in support for
+\l {Using File Selectors with Qt Quick Controls 2}{style-based file selectors}.
To do this, we must move the ToolBar out into its own file. We'll call it
\c ChatToolBar.qml. This will be the \e "default" version of the file, which
means that it will be used when the \l {Default Style}{Default style} is in
@@ -758,7 +758,7 @@ use. Here's the new file:
\printuntil }
As we only use the ToolBar type within this file, we only need the
-Qt Labs Controls import. The code itself has not changed from how it was
+Qt Quick Controls 2 import. The code itself has not changed from how it was
in \c ContactPage.qml, which is how it should be; for the default version
of the file, nothing needs to be different.
@@ -835,7 +835,7 @@ After building and running the application, you should see these results:
\section1 Summary
In this tutorial, we've taken you through the following steps of writing a
-basic application using Qt Labs Controls:
+basic application using Qt Quick Controls 2:
\list
\li Creating a new project using Qt Creator.
diff --git a/examples/controls/gallery/doc/src/qtquickcontrols-gallery.qdoc b/examples/controls/gallery/doc/src/qtquickcontrols-gallery.qdoc
index 2b667f63..b1420101 100644
--- a/examples/controls/gallery/doc/src/qtquickcontrols-gallery.qdoc
+++ b/examples/controls/gallery/doc/src/qtquickcontrols-gallery.qdoc
@@ -27,8 +27,8 @@
/*!
\example gallery
- \title Qt Labs Controls - Gallery
- \ingroup qtlabscontrols-examples
+ \title Qt Quick Controls 2 - Gallery
+ \ingroup qtquickcontrols2-examples
\brief A gallery of controls
\raw HTML
@@ -53,7 +53,7 @@
\endraw
The gallery example is a simple application with a drawer menu that contains
- all the \l {Qt Labs Controls}. Each menu item opens a page that shows the
+ all the \l {Qt Quick Controls 2}. Each menu item opens a page that shows the
graphical appearance of a control, allows you to interact with the control,
and explains in which circumstances it is handy to use this control.
diff --git a/examples/controls/gallery/gallery.qml b/examples/controls/gallery/gallery.qml
index cb549475..ed6fd201 100644
--- a/examples/controls/gallery/gallery.qml
+++ b/examples/controls/gallery/gallery.qml
@@ -50,7 +50,7 @@ ApplicationWindow {
width: 360
height: 520
visible: true
- title: "Qt Labs Controls"
+ title: "Qt Quick Controls 2"
Settings {
id: settings
@@ -186,7 +186,7 @@ ApplicationWindow {
Label {
color: "#26282a"
- text: "Qt Labs Controls provides a set of controls that can be used to build complete interfaces in Qt Quick."
+ text: "Qt Quick Controls 2 provides a set of controls that can be used to build complete interfaces in Qt Quick."
anchors.margins: 20
anchors.top: logo.bottom
anchors.left: parent.left
@@ -302,7 +302,7 @@ ApplicationWindow {
Label {
width: aboutDialog.availableWidth
- text: "The Qt Labs Controls module is a technology preview of the next generation user interface controls based on Qt Quick."
+ text: "The Qt Quick Controls 2 module is a technology preview of the next generation user interface controls based on Qt Quick."
wrapMode: Label.Wrap
font.pixelSize: 12
}