aboutsummaryrefslogtreecommitdiffstats
path: root/examples
diff options
context:
space:
mode:
authorVenugopal Shivashankar <Venugopal.Shivashankar@qt.io>2019-08-12 16:05:44 +0200
committerVenugopal Shivashankar <Venugopal.Shivashankar@qt.io>2019-08-22 08:32:02 +0200
commitf74cff42a76a363d98055b2d10ea4d5b96532f2d (patch)
tree4d8a3575a9f894ec18140f09f847abcca5031bf4 /examples
parent63a4ecea93e278eeaa5de23d774d4dee06d9c4fa (diff)
Doc: Replace the "Qt Quick Controls 2" instances
Now that Controls 1 is deprecated, it's ideal to use "Qt Quick Controls" instead of "Qt Quick Controls 2". Task-number: QTBUG-70333 Change-Id: Ie745db4b61071ddb5e06150d4e739cda74c59f41 Reviewed-by: Paul Wicking <paul.wicking@qt.io>
Diffstat (limited to 'examples')
-rw-r--r--examples/quickcontrols2/chattutorial/doc/src/qtquickcontrols2-chattutorial.qdoc26
-rw-r--r--examples/quickcontrols2/contactlist/doc/src/qtquickcontrols2-contactlist.qdoc2
-rw-r--r--examples/quickcontrols2/flatstyle/doc/src/qtquickcontrols2-flatstyle.qdoc2
-rw-r--r--examples/quickcontrols2/gallery/doc/src/qtquickcontrols2-gallery.qdoc2
-rw-r--r--examples/quickcontrols2/texteditor/doc/src/qtquickcontrols2-texteditor.qdoc4
-rw-r--r--examples/quickcontrols2/wearable/doc/src/qtquickcontrols2-wearable.qdoc4
6 files changed, 20 insertions, 20 deletions
diff --git a/examples/quickcontrols2/chattutorial/doc/src/qtquickcontrols2-chattutorial.qdoc b/examples/quickcontrols2/chattutorial/doc/src/qtquickcontrols2-chattutorial.qdoc
index f7cbd32f..0da8f7c5 100644
--- a/examples/quickcontrols2/chattutorial/doc/src/qtquickcontrols2-chattutorial.qdoc
+++ b/examples/quickcontrols2/chattutorial/doc/src/qtquickcontrols2-chattutorial.qdoc
@@ -28,13 +28,13 @@
/*!
\example chattutorial
\keyword Qt Quick Controls - Chat Tutorial
- \title Qt Quick Controls - Chat Tutorial
- \keyword Qt Quick Controls 2 - Chat Tutorial
-\brief Tutorial about writing a basic chat client using Qt Quick Controls 2.
+\title Qt Quick Controls - Chat Tutorial
+\keyword Qt Quick Controls 2 - Chat Tutorial
+\brief Tutorial about writing a basic chat client using Qt Quick Controls.
\ingroup qtquickcontrols2-examples
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
+Controls. It will also explain how to integrate an SQL database into a Qt
application.
\section1 Chapter 1: Setting Up
@@ -88,7 +88,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 Quick Controls 2}{file selectors}.
+for using \l {Using File Selectors with Qt Quick Controls}{file selectors}.
Once we've set up things in C++, we can move on to the user interface in QML.
@@ -105,7 +105,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, import the Qt Quick Controls 2 module. Amongst other things, this
+Next, import the Qt Quick Controls module. Amongst other things, this
provides access to \l ApplicationWindow, which will replace the existing
root type, \c Window:
@@ -156,7 +156,7 @@ property.
Then, we 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 Quick Controls 2}{styling} and \l {Control::}{font} inheritance.
+\l{Styling Qt Quick Controls}{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.
@@ -228,7 +228,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 Quick Controls 2 module, and provides a standard view item for use in views
+the Qt Quick Controls 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.
@@ -746,7 +746,7 @@ text field to make way for future input.
\section1 Chapter 5: Styling
-Styles in Qt Quick Controls 2 are designed to work on any platform. In this
+Styles in Qt Quick Controls 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.
@@ -784,8 +784,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 Quick Controls 2's built-in support for
-\l {Using File Selectors with Qt Quick Controls 2}{style-based file selectors}.
+Instead, it is better to rely on Qt Quick Controls's built-in support for
+\l {Using File Selectors with Qt Quick Controls}{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
@@ -796,7 +796,7 @@ use. Here's the new file:
\printuntil }
As we only use the ToolBar type within this file, we only need the
-Qt Quick Controls 2 import. The code itself has not changed from how it was
+Qt Quick Controls 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.
@@ -876,7 +876,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 Quick Controls 2:
+basic application using Qt Quick Controls:
\list
\li Creating a new project using Qt Creator.
diff --git a/examples/quickcontrols2/contactlist/doc/src/qtquickcontrols2-contactlist.qdoc b/examples/quickcontrols2/contactlist/doc/src/qtquickcontrols2-contactlist.qdoc
index 2c692430..1c97617c 100644
--- a/examples/quickcontrols2/contactlist/doc/src/qtquickcontrols2-contactlist.qdoc
+++ b/examples/quickcontrols2/contactlist/doc/src/qtquickcontrols2-contactlist.qdoc
@@ -30,7 +30,7 @@
\title Qt Quick Controls - Contact List
\keyword Qt Quick Controls 2 - Contact List
\ingroup qtquickcontrols2-examples
- \brief A QML app using Qt Quick Controls 2 and a C++ class that implements
+ \brief A QML app using Qt Quick Controls and a C++ class that implements
a simple contact list.
The \e {Contact List Example} shows how to integrate a C++ backend in a way that
diff --git a/examples/quickcontrols2/flatstyle/doc/src/qtquickcontrols2-flatstyle.qdoc b/examples/quickcontrols2/flatstyle/doc/src/qtquickcontrols2-flatstyle.qdoc
index a71c2093..5da21ff4 100644
--- a/examples/quickcontrols2/flatstyle/doc/src/qtquickcontrols2-flatstyle.qdoc
+++ b/examples/quickcontrols2/flatstyle/doc/src/qtquickcontrols2-flatstyle.qdoc
@@ -31,7 +31,7 @@
\title Qt Quick Controls - Flat Style
\keyword Qt Quick Controls 2 - Flat Style
\ingroup qtquickcontrols2-examples
- \brief A QML app using Qt Quick Controls 2 and a QML plugin
+ \brief A QML app using Qt Quick Controls and a QML plugin
with customized controls.
\e Flat Style shows how to integrate customized controls into Qt Quick Designer.
diff --git a/examples/quickcontrols2/gallery/doc/src/qtquickcontrols2-gallery.qdoc b/examples/quickcontrols2/gallery/doc/src/qtquickcontrols2-gallery.qdoc
index 463acdee..17496043 100644
--- a/examples/quickcontrols2/gallery/doc/src/qtquickcontrols2-gallery.qdoc
+++ b/examples/quickcontrols2/gallery/doc/src/qtquickcontrols2-gallery.qdoc
@@ -55,7 +55,7 @@
\endraw
The gallery example is a simple application with a drawer menu that contains
- all the \l {Qt Quick Controls 2}. Each menu item opens a page that shows the
+ all the \l {Qt Quick Controls}. 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/quickcontrols2/texteditor/doc/src/qtquickcontrols2-texteditor.qdoc b/examples/quickcontrols2/texteditor/doc/src/qtquickcontrols2-texteditor.qdoc
index 3e9a9268..28cf3f3b 100644
--- a/examples/quickcontrols2/texteditor/doc/src/qtquickcontrols2-texteditor.qdoc
+++ b/examples/quickcontrols2/texteditor/doc/src/qtquickcontrols2-texteditor.qdoc
@@ -30,7 +30,7 @@
\title Qt Quick Controls - Text Editor
\keyword Qt Quick Controls 2 - Text Editor
\ingroup qtquickcontrols2-examples
- \brief A QML app using Qt Quick Controls 2 and a C++ class to
+ \brief A QML app using Qt Quick Controls and a C++ class to
provide a fully-functional rich-text editor application.
The \e {Text Editor Example} presents a sample HTML file using the TextArea
@@ -77,7 +77,7 @@
The touch user interface is a simplified version of the text editor. It is
suitable for touch devices with limited screen size. The example uses
- \l{Using File Selectors with Qt Quick Controls 2}{file selectors} to load
+ \l{Using File Selectors with Qt Quick Controls}{file selectors} to load
the appropriate user interface automatically.
Unlike the desktop version, which uses top-level dialogs, the touch version
diff --git a/examples/quickcontrols2/wearable/doc/src/qtquickcontrols2-wearable.qdoc b/examples/quickcontrols2/wearable/doc/src/qtquickcontrols2-wearable.qdoc
index 95e8329d..7e4edea4 100644
--- a/examples/quickcontrols2/wearable/doc/src/qtquickcontrols2-wearable.qdoc
+++ b/examples/quickcontrols2/wearable/doc/src/qtquickcontrols2-wearable.qdoc
@@ -62,7 +62,7 @@
\section1 Styling
- The demo uses a custom \l {Styling Qt Quick Controls 2}{Qt Quick Controls 2 style}
+ The demo uses a custom \l {Styling Qt Quick Controls}{Qt Quick Controls 2 style}
embedded into the demo's resources. The custom style is implemented for a
few controls only, as it is specific to this particular demo. It uses a
singleton type for various styling attributes, such as fonts and colors.
@@ -114,7 +114,7 @@
\snippet wearable/wearable.cpp icons
The icons are used on the Launcher Page, which is presented below. See
- \l {Icons in Qt Quick Controls 2} for more details about icons and themes.
+ \l {Icons in Qt Quick Controls} for more details about icons and themes.
\section1 Launcher Page