qiurui
/
qtdeclarative
mirror of https://github.com/qt/qtdeclarative.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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>
This commit is contained in:
Venugopal Shivashankar 2019-08-12 16:05:44 +02:00
parent 63a4ecea93
commit f74cff42a7
59 changed files with 233 additions and 229 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
examples/quickcontrols2/chattutorial/doc/src/qtquickcontrols2-chattutorial.qdoc
View File

@ -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.

2
examples/quickcontrols2/contactlist/doc/src/qtquickcontrols2-contactlist.qdoc
View File

@ -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

2
examples/quickcontrols2/flatstyle/doc/src/qtquickcontrols2-flatstyle.qdoc
View File

@ -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.

2
examples/quickcontrols2/gallery/doc/src/qtquickcontrols2-gallery.qdoc
View File

@ -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.

4
examples/quickcontrols2/texteditor/doc/src/qtquickcontrols2-texteditor.qdoc
View File

@ -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

4
examples/quickcontrols2/wearable/doc/src/qtquickcontrols2-wearable.qdoc
View File

@ -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

2
src/imports/calendar/doc/src/qtlabscalendar-index.qdoc
View File

@ -46,6 +46,6 @@
\list
\li \l{Qt Quick}
\li \l{Qt Quick Layouts}
\li \l{Qt Quick Controls 2}
\li \l{Qt Quick Controls}
\endlist
*/

4
src/imports/calendar/doc/src/qtlabscalendar-qmltypes.qdoc
View File

@ -33,7 +33,7 @@
The \l{Qt Labs Calendar} module provides QML types for creating
calendars. These QML types work in conjunction with \l{Qt Quick} and
\l{Qt Quick Controls 2}.
\l{Qt Quick Controls}.
The QML types can be imported into your application using the
following import statement in your .qml file:
@ -51,7 +51,7 @@
\section1 Related Information
\list
\li \l {Qt Quick Controls 2 QML Types}
\li \l {Qt Quick Controls QML Types}
\endlist
\noautolist

3
src/imports/controls/doc/qtquickcontrols.qdocconf
View File

@ -8,8 +8,7 @@ project = QtQuickControls
description = Qt Quick Controls Reference Documentation
version = $QT_VERSION
qhp.projects = QtQuickControls
moduleheader = QtQuickControls2
qhp.projects = QtQuickControls2
qhp.QtQuickControls.file = qtquickcontrols.qhp
qhp.QtQuickControls.namespace = org.qt-project.qtquickcontrols.$QT_VERSION_TAG

4
src/imports/controls/doc/src/qtquickcontrols2-buttons.qdoc
View File

@ -31,7 +31,7 @@
\ingroup qtquickcontrols2-guidelines
\brief Guidelines for button controls
Qt Quick Controls 2 offers a selection of button-like controls.
Qt Quick Controls offers a selection of button-like controls.
\annotatedlist qtquickcontrols2-buttons
@ -186,6 +186,6 @@
\section1 Related Information
\list
\li \l {Qt Quick Controls 2 Guidelines}
\li \l {Qt Quick Controls Guidelines}
\endlist
*/

14
src/imports/controls/doc/src/qtquickcontrols2-configuration.qdoc
View File

@ -31,8 +31,8 @@
\title Qt Quick Controls Configuration File
\keyword Qt Quick Controls 2 Configuration File
Qt Quick Controls 2 support a special configuration file, \c :/qtquickcontrols2.conf,
that is built into an application's resources.
Qt Quick Controls support a special configuration file, \c qtquickcontrols2.conf,
which is built into an application's resources.
The configuration file can specify the preferred style and certain style-specific
attributes. The following example specifies that the preferred style is the \l {Material style}.
@ -56,7 +56,7 @@
\endcode
It is possible to specify a custom location for the configuration file with
the \l {Supported Environment Variables in Qt Quick Controls 2}
the \l {Supported Environment Variables in Qt Quick Controls}
{QT_QUICK_CONTROLS_CONF} environment variable.
\section1 Controls Section
@ -174,7 +174,7 @@
\section1 Using the Configuration File in a Project
In order to make it possible for Qt Quick Controls 2 to find the configuration file,
In order to make it possible for Qt Quick Controls to find the configuration file,
it must be built into application's resources using the \l {The Qt Resource System}.
Here's an example \c .qrc file:
@ -186,7 +186,7 @@
</RCC>
\endcode
\note Qt Quick Controls 2 uses a file selector to load the configuration file. It
\note Qt Quick Controls uses a file selector to load the configuration file. It
is possible to provide a different configuration file for different platforms and
locales. See \l QFileSelector documentation for more details.
@ -200,7 +200,7 @@
\section1 Related Information
\list
\li \l{Styling Qt Quick Controls 2}
\li \l{Supported Environment Variables in Qt Quick Controls 2}
\li \l{Styling Qt Quick Controls}
\li \l{Supported Environment Variables in Qt Quick Controls}
\endlist
*/

2
src/imports/controls/doc/src/qtquickcontrols2-containers.qdoc
View File

@ -31,7 +31,7 @@
\ingroup qtquickcontrols2-guidelines
\brief Guidelines for container controls
Qt Quick Controls 2 offers a selection of container-like controls.
Qt Quick Controls offers a selection of container-like controls.
\annotatedlist qtquickcontrols2-containers

19
src/imports/controls/doc/src/qtquickcontrols2-customize.qdoc
View File

@ -27,10 +27,11 @@
/*!
\page qtquickcontrols2-customize.html
\title Customizing Qt Quick Controls 2
\keyword Customizing Qt Quick Controls 2
\title Customizing Qt Quick Controls
\brief A set of UI controls to create user interfaces in Qt Quick
Qt Quick Controls 2 consist of a hierarchy (tree) of items. In order to
Qt Quick Controls consist of a hierarchy (tree) of items. In order to
provide a custom look and feel, the default QML implementation of each
item can be replaced with a custom one.
@ -119,7 +120,7 @@
\endqml
As you now have the \c MyControls namespace, you can name the controls after
their actual counterparts in the Qt Quick Controls 2 module. You can repeat
their actual counterparts in the Qt Quick Controls module. You can repeat
this process for any control that you wish to add.
An added benefit of these three methods is that it's not necessary to
@ -132,9 +133,9 @@
\section2 Definition of a Style
In Qt Quick Controls 2, a style is essentially an interchangeable set of
In Qt Quick Controls, a style is essentially an interchangeable set of
QML files within a single directory. There are three requirements for a style
to be \l {Using Styles in Qt Quick Controls 2}{usable}:
to be \l {Using Styles in Qt Quick Controls}{usable}:
\list
\li At least one QML file whose name matches a control (for example,
@ -143,7 +144,7 @@
{QtQuick.Templates} import as the root item. For example,
Button.qml must contain a Button template as its root item.
If we instead used the corresponding type from the \l {Qt Quick Controls 2}
If we instead used the corresponding type from the \l {Qt Quick Controls}
{QtQuick.Controls} import as we did in the previous section, it would not work:
the control we were defining would try to derive from itself.
\li The files must be in a directory in the filesystem or in the
@ -176,7 +177,7 @@
Using the approach above, it is possible to preview a custom style
in \l {Using Qt Quick Designer}{Qt Quick Designer}. In order to do so,
ensure that the project has a
\l {Qt Quick Controls 2 Configuration File}{qtquickcontrols2.conf} file,
\l {Qt Quick Controls Configuration File}{qtquickcontrols2.conf} file,
and that the following entry exists:
\badcode
@ -185,7 +186,7 @@
\endcode
For more information, take a look at the
\l {Qt Quick Controls 2 - Flat Style}{Flat Style example}.
\l {Qt Quick Controls - Flat Style}{Flat Style example}.
\section2 Style-specific C++ Extensions
@ -390,7 +391,7 @@
With that in place, we can run our example. To tell the application to
use our new style, we pass \c {-style :/mystyle} as an application
argument, but there are \l {Using Styles in Qt Quick Controls 2}{many
argument, but there are \l {Using Styles in Qt Quick Controls}{many
ways} to specify the style to use.
The end result:

8
src/imports/controls/doc/src/qtquickcontrols2-default.qdoc
View File

@ -32,14 +32,14 @@
The Default style is a basic all-round style.
The Default style is a simple and light-weight style that offers the maximum
performance for Qt Quick Controls 2. It is built with a minimal amount of Qt
performance for Qt Quick Controls. It is built with a minimal amount of Qt
Quick primitives, and keeps animations and transitions to the minimum.
\image qtquickcontrols2-default.png
The style is selected by default when running Qt Quick Controls 2 applications.
The style is selected by default when running Qt Quick Controls applications.
It is built into the module's resources, so by default it is shipped with
any application that depends on the Qt Quick Controls 2 module
any application that depends on the Qt Quick Controls module
\note The Default style is used as a fallback for other styles. If a style
does not implement a certain control, the Default style implementation of
@ -50,6 +50,6 @@
\section1 Related Information
\list
\li \l{Styling Qt Quick Controls 2}
\li \l{Styling Qt Quick Controls}
\endlist
*/

4
src/imports/controls/doc/src/qtquickcontrols2-delegates.qdoc
View File

@ -31,7 +31,7 @@
\ingroup qtquickcontrols2-guidelines
\brief Guidelines for delegate controls
Qt Quick Controls 2 offers a selection of controls that are used as
Qt Quick Controls offers a selection of controls that are used as
delegates in views.
\annotatedlist qtquickcontrols2-delegates
@ -74,6 +74,6 @@
\section1 Related Information
\list
\li \l {Qt Quick Controls 2 Guidelines}
\li \l {Qt Quick Controls Guidelines}
\endlist
*/

4
src/imports/controls/doc/src/qtquickcontrols2-deployment.qdoc
View File

@ -27,9 +27,9 @@
/*!
\page qtquickcontrols2-deployment.html
\title Deploying Qt Quick Controls 2 Applications
\title Deploying Qt Quick Controls Applications
Deployment of Qt Quick Controls 2 applications is very similar to
Deployment of Qt Quick Controls applications is very similar to
deployment of other types of Qt applications. However, there are a few
factors to consider.

54
src/imports/controls/doc/src/qtquickcontrols2-differences.qdoc
View File

@ -36,7 +36,7 @@
or platform-independent style.
On embedded systems, where the hardware has limited resources, this approach
can be inefficient. Qt Quick Controls 2 was designed to solve this problem,
can be inefficient. Qt Quick Controls was designed to solve this problem,
using
\l {https://blog.qt.io/blog/2015/03/31/qt-quick-controls-for-embedded/}{benchmarks}
to guide the development.
@ -58,7 +58,7 @@
Read more about implementing a style plugin
\l {Creating a Custom Style}{here}.
In Qt Quick Controls 2, styles no longer provide components that are
In Qt Quick Controls, styles no longer provide components that are
dynamically instantiated by controls, but controls themselves consist of
item delegates that can be replaced. In effect, this means that delegates
are Qt Quick items that are instantiated on the spot, as properties of the
@ -89,7 +89,7 @@
}
\endqml
The API of Qt Quick Controls 2 aims to be clean and simple. Common
The API of Qt Quick Controls aims to be clean and simple. Common
operations are easy, and more advanced ones are liberally documented with
snippets that can be copied into your code.
@ -99,7 +99,7 @@
\header
\li
\li Qt Quick Controls 1
\li Qt Quick Controls 2
\li Qt Quick Controls
\row
\li Stylable delegates
\li Yes
@ -138,7 +138,7 @@
\section2 Porting Qt Quick Controls 1 Code
The API of Qt Quick Controls 2 is very similar to Qt Quick Controls 1, but it
The API of Qt Quick Controls is very similar to Qt Quick Controls 1, but it
does come with some changes necessary to facilitate the improvements. The
majority of changes are to do with styling; all of a control's delegates
are now accessible in the control itself, instead of in a separate style
@ -156,7 +156,7 @@
}
\endqml
To style a button in Qt Quick Controls 2:
To style a button in Qt Quick Controls:
\qml
Button {
@ -189,7 +189,7 @@
The first column lists all types available in \l {Qt Quick Controls 1},
\l {Qt Quick Dialogs}, and \l {Qt Quick Extras}.
The second column documents the respective type in Qt Quick Controls 2.
The second column documents the respective type in Qt Quick Controls.
When a direct alternative is not available, the third column contains
an alternative that provides related functionality. The last column
contains some remarks about the differences between the types in the
@ -198,7 +198,7 @@
\table
\header
\li Qt Quick Controls 1
\li Qt Quick Controls 2
\li Qt Quick Controls
\li Alternatives
\li Remarks
\row
@ -245,9 +245,9 @@
\li \l [QML QtQuickControls1] {ExclusiveGroup}
\li \mdash
\li \l [QML QtQuickControls2] {ActionGroup},\br
\l [QML QtQuickControls2] {ButtonGroup} \br\sup {(Qt Quick Controls 2)}
\l [QML QtQuickControls2] {ButtonGroup} \br\sup {(Qt Quick Controls)}
\li \list
\li \b {Qt Quick Controls 2}: \c ActionGroup and \c ButtonGroup offer similar functionality.
\li \b {Qt Quick Controls}: \c ActionGroup and \c ButtonGroup offer similar functionality.
\endlist
\row
\li \l [QML QtQuickControls1] {GroupBox}
@ -270,7 +270,7 @@
supports traditional desktop style cascading submenus, but does not
work on Embedded Linux because \l EGLFS does not support multiple
top-level windows.
\li \b {Qt Quick Controls 2}: \c Menu is a non-native \c Item-based popup
\li \b {Qt Quick Controls}: \c Menu is a non-native \c Item-based popup
that is stacked above the application content. Due to this, menu popups
are restricted within window boundaries. \c Menu is fully customizable
using QML and Qt Quick, and allows adding any \c Items. Traditional
@ -288,7 +288,7 @@
\li \b {Qt Quick Controls 1}: \c MenuBar is native on platforms where an
implementation is available in the Qt Platform Abstraction Layer. Other
platforms use a QML-based menubar item stacked at the top of the window.
\li \b {Qt Quick Controls 2}: \c MenuBar is a non-native QML-based menubar
\li \b {Qt Quick Controls}: \c MenuBar is a non-native QML-based menubar
that can be fully customized using QML and Qt Quick.
\li \b {Qt Labs Platform}: \c MenuBar is an \e experimental native menubar.
It is only available on platforms where a native implementation is available
@ -305,7 +305,7 @@
\li \b {Qt Quick Controls 1}: \c MenuItem and \c MenuSeparator are native
on platforms where an implementation is available in the Qt Platform
Abstraction Layer. Other platforms use QML-based menu items and separators.
\li \b {Qt Quick Controls 2}: \c MenuItem and \c MenuSeparator are a non-native
\li \b {Qt Quick Controls}: \c MenuItem and \c MenuSeparator are a non-native
QML-based menu items and separators that can be fully customized using QML
and Qt Quick.
\li \b {Qt Labs Platform}: \c MenuItem and \c MenuSeparator are \e experimental
@ -343,7 +343,7 @@
\li \list
\li \b {Qt Quick Controls 1}: Uses \l Layout attached properties
to specify size hints.
\li \b {Qt Quick Controls 2}: Uses dedicated
\li \b {Qt Quick Controls}: Uses dedicated
\l [QML QtQuickControls2] {SplitView} attached properties
to specify size hints.
Allows \l {SplitView::saveState()}{saving} and
@ -358,15 +358,15 @@
\li \l [QML QtQuickControls2] {StackView}
\li
\li \list
\li \b {Qt Quick Controls 2}: \c StackView provides customizable transitions
\li \b {Qt Quick Controls}: \c StackView provides customizable transitions
and attached properties via a single \c StackView type.
\endlist
\row
\li \l [QML QtQuickControls1] {StatusBar}
\li \mdash
\li \l [QML QtQuickControls2] {ToolBar} \br\sup {(Qt Quick Controls 2)}
\li \l [QML QtQuickControls2] {ToolBar} \br\sup {(Qt Quick Controls)}
\li \list
\li \b {Qt Quick Controls 2}: \c ApplicationWindow allows assigning any
\li \b {Qt Quick Controls}: \c ApplicationWindow allows assigning any
item or control, such as \c ToolBar, as a header or footer.
\endlist
\row
@ -379,9 +379,9 @@
\l [QML QtQuickControls1] {Tab}
\li \mdash
\li \l [QML QtQuickControls2] {TabBar},\br
\l [QML QtQuickControls2] {TabButton} \br\sup {(Qt Quick Controls 2)}
\l [QML QtQuickControls2] {TabButton} \br\sup {(Qt Quick Controls)}
\li \list
\li \b {Qt Quick Controls 2}: \c TabBar and \c TabButton offer similar
\li \b {Qt Quick Controls}: \c TabBar and \c TabButton offer similar
functionality, and can be used to build tabbed views.
\endlist
\row
@ -397,7 +397,7 @@
\li \list
\li \b {Qt Quick Controls 1}: \c TextArea inherits \c ScrollView and is therefore
always a scrollable editor.
\li \b {Qt Quick Controls 2}: \c TextArea is a simpler multi-line editor that can
\li \b {Qt Quick Controls}: \c TextArea is a simpler multi-line editor that can
be optionally attached to a \c Flickable to provide scrolling functionality.
This allows using \c TextArea in a scrollable page without having two nested
scrollable areas, which can be problematic and cause usability issues.
@ -425,7 +425,7 @@
\header
\li Qt Quick Dialogs
\li Qt Quick Controls 2
\li Qt Quick Controls
\li Alternatives
\li Remarks
\row
@ -435,7 +435,7 @@
\li \list
\li \b {Qt Quick Dialogs}: \c Dialog is either a top-level window or an \c Item-based popup
depending on whether the underlying platform supports multiple top-level windows.
\li \b {Qt Quick Controls 2}: \c Dialog is not a top-level window, but an \c Item-based
\li \b {Qt Quick Controls}: \c Dialog is not a top-level window, but an \c Item-based
popup that is stacked above the application content. Due to this, dialogs are restricted
within window boundaries.
\endlist
@ -462,7 +462,7 @@
\header
\li Qt Quick Extras
\li Qt Quick Controls 2
\li Qt Quick Controls
\li Alternatives
\li Remarks
\row
@ -512,14 +512,14 @@
\li
\li \list
\li \b {Qt Quick Extras}: \c Tumbler can consist of multiple columns.
\li \b {Qt Quick Controls 2}: \c Tumbler presents a single spinnable wheel.
\li \b {Qt Quick Controls}: \c Tumbler presents a single spinnable wheel.
Multiple columns can be created by placing multiple \c Tumblers next
to each other.
\endlist
\header
\li No Predecessor
\li Qt Quick Controls 2
\li Qt Quick Controls
\li Alternatives
\li Remarks
\row
@ -672,7 +672,7 @@
\li \list
\li \b {Qt Quick Controls 1}: \c Button and \c Action have built-in
Qt Widgets-based tooltips.
\li \b {Qt Quick Controls 2}: \c ToolTip can be attached to any \c Item.
\li \b {Qt Quick Controls}: \c ToolTip can be attached to any \c Item.
\endlist
\endtable
@ -680,7 +680,7 @@
\list
\li \l{Qt Quick}
\li \l{Qt Quick Controls 2 QML Types}
\li \l{Qt Quick Controls QML Types}
\li \l{Qt Quick Controls 1 QML Types}
\li \l{Qt Quick Extras QML Types}
\li \l{Qt Labs Calendar QML Types}

18
src/imports/controls/doc/src/qtquickcontrols2-environment.qdoc
View File

@ -27,9 +27,9 @@
/*!
\page qtquickcontrols2-environment.html
\title Supported Environment Variables in Qt Quick Controls 2
\title Supported Environment Variables in Qt Quick Controls
This page contains a list of all environment variables that Qt Quick Controls 2
This page contains a list of all environment variables that Qt Quick Controls
supports. The environment variables are primarily meant for testing purposes, but
they can also be used to set system-wide defaults.
@ -39,7 +39,7 @@
\li Description
\row
\li \c QT_QUICK_CONTROLS_STYLE
\li Specifies the default \l {Styling Qt Quick Controls 2}{Qt Quick Controls 2 style}.
\li Specifies the default \l {Styling Qt Quick Controls}{Qt Quick Controls style}.
The value can be either one of the built-in styles, for example \c "Material",
or the path to a custom style such as \c ":/mystyle".
\row
@ -48,18 +48,18 @@
The value can be one of the built-in styles, for example \c "Material",
\row
\li \c QT_QUICK_CONTROLS_STYLE_PATH
\li Specifies a list of additional paths that are used to lookup \l {Styling Qt Quick Controls 2}
{Qt Quick Controls 2 styles}. Multiple path entries must be \l {QDir::listSeparator}{separated}
\li Specifies a list of additional paths that are used to lookup \l {Styling Qt Quick Controls}
{Qt Quick Controls styles}. Multiple path entries must be \l {QDir::listSeparator}{separated}
by \c ':' under Unix and \c ';' under Windows. By default, styles are looked up from
\c $QML2_IMPORT_PATH/QtQuick/Controls.2.
\row
\li \c QT_QUICK_CONTROLS_CONF
\li Specifies the location of the \l {Qt Quick Controls 2 configuration file}.
\li Specifies the location of the \l {Qt Quick Controls configuration file}.
By default, the configuration file is loaded from the application's
resources in \c ":/qtquickcontrols2.conf".
\row
\li \c QT_QUICK_CONTROLS_HOVER_ENABLED
\li Specifies whether Qt Quick Controls 2 use \l {Control::hoverEnabled}{hover effects}.
\li Specifies whether Qt Quick Controls use \l {Control::hoverEnabled}{hover effects}.
The value can be set to \c 0 or \c 1 to disable or enable hover effects, respectively.
\endtable
@ -78,7 +78,7 @@
\section1 Related Information
\list
\li \l{Styling Qt Quick Controls 2}
\li \l{Qt Quick Controls 2 Configuration File}
\li \l{Styling Qt Quick Controls}
\li \l{Qt Quick Controls Configuration File}
\endlist
*/

4
src/imports/controls/doc/src/qtquickcontrols2-examples.qdoc
View File

@ -31,7 +31,7 @@
\keyword Qt Quick Controls Examples
\title Qt Quick Controls Examples
\keyword Qt Quick Controls 2 Examples
\brief A collection of examples for \l {Qt Quick Controls 2}
\brief A collection of examples for \l {Qt Quick Controls}
These examples demonstrate creating user interfaces using \l {Qt Quick Controls 2}.
These examples demonstrate creating user interfaces using \l {Qt Quick Controls}.
*/

8
src/imports/controls/doc/src/qtquickcontrols2-fileselectors.qdoc
View File

@ -27,11 +27,11 @@
/*!
\page qtquickcontrols2-fileselectors.html
\title Using File Selectors with Qt Quick Controls 2
\title Using File Selectors with Qt Quick Controls
\l {QFileSelector}{File selectors} provide a convenient way of selecting
file variants. Qt offers the platform name and the locale as built-in
selectors. Qt Quick Controls 2 extends the built-in selectors with the name
selectors. Qt Quick Controls extends the built-in selectors with the name
(lowercase) of the style that an application is running with.
By using file selectors, style-specific tweaks can be applied without
@ -41,7 +41,7 @@
to some code duplication, but on the other hand, cuts the aforementioned
hard dependency to the style, and leads to simpler and more efficient
QML code. The same technique is used to implement the \l {Styling Qt
Quick Controls 2}{Qt Quick Controls 2 styles}.
Quick Controls}{Qt Quick Controls styles}.
The following example demonstrates a custom rounded button that has a
styled drop shadow in the \l {Material Style}{Material style}, and looks
@ -136,6 +136,6 @@
\list
\li \l {QFileSelector}
\li \l {QQmlFileSelector}
\li \l {Styling Qt Quick Controls 2}
\li \l {Styling Qt Quick Controls}
\endlist
*/

9
src/imports/controls/doc/src/qtquickcontrols2-focus.qdoc
View File

@ -27,10 +27,11 @@
/*!
\page qtquickcontrols2-focus.html
\title Focus Management in Qt Quick Controls 2
\brief Overview of focus handling with Qt Quick Controls 2
\keyword Focus Management in Qt Quick Controls 2
\title Focus Management in Qt Quick Controls
\brief Overview of focus handling with Qt Quick Controls
Qt Quick Controls 2 follows the standard
Qt Quick Controls follows the standard
\l {Keyboard Focus in Qt Quick}{Qt Quick focus system}, while also
providing some added convenience. For example, the
\l {Control::}{focusPolicy} property can be used to control the ways in
@ -38,7 +39,7 @@
\section1 Focus Scope Controls
Qt Quick Controls 2 offers a selection of controls that act as
Qt Quick Controls offers a selection of controls that act as
\l {Acquiring Focus and Focus Scopes}{focus scopes}:
\annotatedlist qtquickcontrols2-focusscopes

4
src/imports/controls/doc/src/qtquickcontrols2-fusion.qdoc
View File

@ -38,7 +38,7 @@
\image qtquickcontrols2-fusion.png
To run an application with the Fusion style, see
\l {Using Styles in Qt Quick Controls 2}.
\l {Using Styles in Qt Quick Controls}.
\note The Fusion style is not a native desktop style. The style runs on any
platform, and looks similar everywhere. Minor differences may occur due to
@ -88,6 +88,6 @@
\section1 Related Information
\list
\li \l{Styling Qt Quick Controls 2}
\li \l{Styling Qt Quick Controls}
\endlist
*/

5
src/imports/controls/doc/src/qtquickcontrols2-gettingstarted.qdoc
View File

@ -27,7 +27,8 @@
/*!
\page qtquickcontrols2-gettingstarted.html
\title Getting Started with Qt Quick Controls 2
\keyword Getting Started with Qt Quick Controls 2
\title Getting Started with Qt Quick Controls
A basic example of a QML file that makes use of controls is shown here:
@ -54,7 +55,7 @@
C++ application, doing this means you can only set window properties from
C++.
With Qt Quick Controls 2, declare an ApplicationWindow as the root item of
With Qt Quick Controls, declare an ApplicationWindow as the root item of
your application and launch it by using QQmlApplicationEngine instead.
This ensures that you can control top level window properties from QML.

4
src/imports/controls/doc/src/qtquickcontrols2-guidelines.qdoc
View File

@ -31,7 +31,7 @@
\title Qt Quick Controls Guidelines
\keyword Qt Quick Controls 2 Guidelines
Qt Quick Controls 2 offers a selection of controls that can be used to
Qt Quick Controls offers a selection of controls that can be used to
build complete interfaces in Qt Quick.
Below you will find practical guidelines on how and when to use
@ -41,6 +41,6 @@
\section1 Related Information
\list
\li \l{Qt Quick Controls 2 QML Types}{All Qt Quick Controls 2 QML Types}
\li \l{Qt Quick Controls QML Types}{All Qt Quick Controls QML Types}
\endlist
*/

7
src/imports/controls/doc/src/qtquickcontrols2-highdpi.qdoc
View File

@ -27,9 +27,10 @@
/*!
\page qtquickcontrols2-highdpi.html
\title High-DPI Support in Qt Quick Controls 2
\keyword High-DPI Support in Qt Quick Controlsi 2
\title High-DPI Support in Qt Quick Controls
Qt Quick Controls 2 support Qt's cross-platform high-DPI scaling introduced in Qt 5.6.
Qt Quick Controls support Qt's cross-platform high-DPI scaling introduced in Qt 5.6.
The feature is opt-in, and can be enabled by setting the \c Qt::AA_EnableHighDpiScaling
application attribute in C++ before QGuiApplication is constructed:
@ -52,7 +53,7 @@
\warning \l {Qt Quick Controls}{Qt Quick Controls 1.x} are not compatible with Qt's
automatic high-DPI scaling. There is currently no available solution for high-DPI
support in applications wishing to mix Qt Quick Controls and Qt Quick Controls 2.
support in applications wishing to mix Qt Quick Controls and Qt Quick Controls.
\section1 Related Information
\list

15
src/imports/controls/doc/src/qtquickcontrols2-icons.qdoc
View File

@ -27,11 +27,12 @@
/*!
\page qtquickcontrols2-icons.html
\title Icons in Qt Quick Controls 2
\keyword Icons in Qt Quick Controls 2
\title Icons in Qt Quick Controls
Qt Quick Controls 2.3 (Qt 5.10) introduced built-in support for icons. Buttons,
item delegates, and menu items are now capable of presenting an icon in addition
to a text label.
Qt Quick Controls comes with support for icons since Qt 5.10. This means,
Buttons, item delegates, and menu items are now capable of presenting an
icon in addition to a text label.
\section1 Using Icons
@ -58,7 +59,7 @@
}
\endcode
Each \l {Styling Qt Quick Controls 2}{Qt Quick Controls 2 style} requests a
Each \l {Styling Qt Quick Controls}{Qt Quick Controls 2 style} requests a
default icon size and color according to their guidelines, but it is possible
to override these by setting the \c icon.width, \c icon.height, and \c icon.color
properties.
@ -159,11 +160,11 @@
}
\endcode
The \l {Qt Quick Controls 2 - Gallery}{Gallery example} and \l {Qt Quick Controls 2 - Wearable Demo}
The \l {Qt Quick Controls - Gallery}{Gallery example} and \l {Qt Quick Controls 2 - Wearable Demo}
{Wearable Demo} provide complete runnable applications with a bundled icon theme.
\section1 Related Information
\list
\li \l {High-DPI Support in Qt Quick Controls 2}
\li \l {High-DPI Support in Qt Quick Controls}
\endlist
*/

18
src/imports/controls/doc/src/qtquickcontrols2-imagine.qdoc
View File

@ -50,7 +50,7 @@
\caption The Imagine style with the default images
To run an application with the Imagine style, see
\l {Using Styles in Qt Quick Controls 2}.
\l {Using Styles in Qt Quick Controls}.
\section2 File Names
@ -2387,7 +2387,7 @@
See Sketch's \l {https://sketchapp.com/docs/exporting/}{Exporting} documentation.
Qt Quick Controls 2 also provides a
Qt Quick Controls also provides a
\l {http://code.qt.io/cgit/qt/qtquickcontrols2.git/tree/src/imports/controls/imagine/design}
{plugin} for Sketch that automatically fixes the thickness of the 9-patch lines
after the assets are exported. To install this file, double-click on it.
@ -2463,7 +2463,7 @@
\include qquickimaginestyle.qdocinc conf
See \l {Qt Quick Controls 2 Configuration File} for more details about the
See \l {Qt Quick Controls Configuration File} for more details about the
configuration file.
\section4 Environment Variables
@ -2471,7 +2471,7 @@
\include qquickimaginestyle.qdocinc env
See \l {Supported Environment Variables in Qt Quick Controls 2} for the full
See \l {Supported Environment Variables in Qt Quick Controls} for the full
list of supported environment variables.
\section3 Palette
@ -2499,11 +2499,11 @@
If the Imagine style is imported in a QML file that is always loaded, the
Imagine style must be deployed with the application in order to be able
to run the application regardless of which style the application is run with.
By using \l {Using File Selectors with Qt Quick Controls 2}{file selectors},
By using \l {Using File Selectors with Qt Quick Controls}{file selectors},
style-specific tweaks can be applied without creating a hard dependency to
a style.
\b {See also} \l {Styling Qt Quick Controls 2}
\b {See also} \l {Styling Qt Quick Controls}
\section1 Attached Property Documentation
@ -2522,8 +2522,8 @@
\section1 Related Information
\list
\li \l{Styling Qt Quick Controls 2}
\li \l{Qt Quick Controls 2 - Imagine Style Example: Automotive}{Automotive Example}
\li \l{Qt Quick Controls 2 - Imagine Style Example: Music Player}{Music Player Example}
\li \l{Styling Qt Quick Controls}
\li \l{Qt Quick Controls - Imagine Style Example: Automotive}{Automotive Example}
\li \l{Qt Quick Controls - Imagine Style Example: Music Player}{Music Player Example}
\endlist
*/

60
src/imports/controls/doc/src/qtquickcontrols2-index.qdoc
View File

@ -32,25 +32,25 @@
\brief Provides a set of UI controls for Qt Quick.
Qt Quick Controls 2 provides a set of controls that can be used
Qt Quick Controls provides a set of controls that can be used
to build complete interfaces in Qt Quick. The module was introduced
in Qt 5.7.
\image qtquickcontrols2-styles.png
Qt Quick Controls 2 comes with a selection customizable styles.
See \l {Styling Qt Quick Controls 2} for more details.
Qt Quick Controls comes with a selection customizable styles.
See \l {Styling Qt Quick Controls} for more details.
\section1 Prerequisites
The \l{Qt Quick Controls 2 QML Types}{QML types} can be imported into your
The \l{Qt Quick Controls QML Types}{QML types} can be imported into your
application using the following import statement in your \c {.qml} file:
\code \QtMinorVersion
import QtQuick.Controls 2.\1
\endcode
The \l{Qt Quick Controls 2 C++ Classes}{C++ classes} can be included into
The \l{Qt Quick Controls C++ Classes}{C++ classes} can be included into
your application using the following include statement:
\code
@ -64,12 +64,12 @@
QT += quickcontrols2
\endcode
For more details, see \l {Getting Started with Qt Quick Controls 2}.
For more details, see \l {Getting Started with Qt Quick Controls}.
\section2 Building From Source
When building from source, ensure that the \l {Qt Graphical Effects} module
is also built, as Qt Quick Controls 2 requires it.
is also built, as Qt Quick Controls requires it.
The \l {Qt Image Formats} module is recommended, but not
required. It provides support for the \c {.webp} format used by the
@ -77,8 +77,8 @@
\section1 Versions
Qt Quick Controls 2.0 was introduced in Qt 5.7. Subsequent minor Qt releases
increment the import version of the Qt Quick Controls 2 modules by one,
Qt Quick Controls.0 was introduced in Qt 5.7. Subsequent minor Qt releases
increment the import version of the Qt Quick Controls modules by one,
until Qt 5.12, where the import versions match Qt's minor version. The
experimental Qt Labs modules use import version 1.0.
@ -86,7 +86,7 @@
\header
\li \c Qt
\li \l {Qt Quick QML Types}{\c QtQuick}
\li \l {Qt Quick Controls 2 QML Types}{\c QtQuick.Controls},\br
\li \l {Qt Quick Controls QML Types}{\c QtQuick.Controls},\br
\l {Material Style}{\c QtQuick.Controls.Material},\br
\l {Universal Style}{\c QtQuick.Controls.Universal},\br
\l {Qt Quick Templates 2 QML Types}{\c QtQuick.Templates}
@ -131,13 +131,13 @@
\section1 License and Attributions
Qt Quick Controls 2 is available under commercial licenses from \l{The Qt Company}.
Qt Quick Controls is available under commercial licenses from \l{The Qt Company}.
In addition, it is available under the
\l{GNU Lesser General Public License, version 3}, or
the \l{GNU General Public License, version 2}.
See \l{Qt Licensing} for further details.
Furthermore Qt Quick Controls 2 potentially contains third party
Furthermore Qt Quick Controls potentially contains third party
modules under following permissive licenses:
\generatelist{groupsbymodule attributions-qtquickcontrols}
@ -145,35 +145,35 @@
\section1 Topics
\list
\li \l{Qt Quick Controls 2 Guidelines}{Guidelines}
\li \l{Styling Qt Quick Controls 2}{Styling}
\li \l{Icons in Qt Quick Controls 2}{Icons}
\li \l{Customizing Qt Quick Controls 2}{Customization}
\li \l{High-DPI Support in Qt Quick Controls 2}{High-DPI Support}
\li \l{Using File Selectors with Qt Quick Controls 2}{Using File Selectors}
\li \l{Deploying Qt Quick Controls 2 Applications}{Deployment}
\li \l{Qt Quick Controls 2 Configuration File}{Configuration File}
\li \l{Supported Environment Variables in Qt Quick Controls 2}{Environment Variables}
\li \l{Qt Quick Controls Guidelines}{Guidelines}
\li \l{Styling Qt Quick Controls}{Styling}
\li \l{Icons in Qt Quick Controls}{Icons}
\li \l{Customizing Qt Quick Controls}{Customization}
\li \l{High-DPI Support in Qt Quick Controls}{High-DPI Support}
\li \l{Using File Selectors with Qt Quick Controls}{Using File Selectors}
\li \l{Deploying Qt Quick Controls Applications}{Deployment}
\li \l{Qt Quick Controls Configuration File}{Configuration File}
\li \l{Supported Environment Variables in Qt Quick Controls}{Environment Variables}
\li \l{Differences with Qt Quick Controls 1}
\endlist
\section1 Reference
\list
\li \l{Qt Quick Controls 2 QML Types}{QML Types}
\li \l{Qt Quick Controls 2 C++ Classes}{C++ Classes}
\li \l{Qt Quick Controls QML Types}{QML Types}
\li \l{Qt Quick Controls C++ Classes}{C++ Classes}
\endlist
\section1 Examples
\list
\li \l{Qt Quick Controls 2 - Gallery}{Gallery}
\li \l{Qt Quick Controls 2 - Chat Tutorial}{Chat Tutorial}
\li \l{Qt Quick Controls 2 - Text Editor}{Text Editor}
\li \l{Qt Quick Controls 2 - Wearable Demo}{Wearable Demo}
\li \l{Qt Quick Controls 2 - Imagine Style Example: Automotive}{Automotive Example}
\li \l{Qt Quick Controls 2 - Imagine Style Example: Music Player}{Music Player Example}
\li \l{Qt Quick Controls 2 Examples}{All Examples}
\li \l{Qt Quick Controls - Gallery}{Gallery}
\li \l{Qt Quick Controls - Chat Tutorial}{Chat Tutorial}
\li \l{Qt Quick Controls - Text Editor}{Text Editor}
\li \l{Qt Quick Controls - Wearable Demo}{Wearable Demo}
\li \l{Qt Quick Controls - Imagine Style Example: Automotive}{Automotive Example}
\li \l{Qt Quick Controls - Imagine Style Example: Music Player}{Music Player Example}
\li \l{Qt Quick Controls Examples}{All Examples}
\endlist
\section1 Related Modules

4
src/imports/controls/doc/src/qtquickcontrols2-indicators.qdoc
View File

@ -31,7 +31,7 @@
\ingroup qtquickcontrols2-guidelines
\brief Guidelines for indicator controls
Qt Quick Controls 2 offers a selection of indicator-like controls.
Qt Quick Controls offers a selection of indicator-like controls.
\annotatedlist qtquickcontrols2-indicators
@ -78,6 +78,6 @@
\section1 Related Information
\list
\li \l {Qt Quick Controls 2 Guidelines}
\li \l {Qt Quick Controls Guidelines}
\endlist
*/

4
src/imports/controls/doc/src/qtquickcontrols2-input.qdoc
View File

@ -31,7 +31,7 @@
\ingroup qtquickcontrols2-guidelines
\brief Guidelines for input controls
Qt Quick Controls 2 offers a variety of input controls for both numeric
Qt Quick Controls offers a variety of input controls for both numeric
and textual input.
\annotatedlist qtquickcontrols2-input
@ -118,6 +118,6 @@
\section1 Related Information
\list
\li \l {Qt Quick Controls 2 Guidelines}
\li \l {Qt Quick Controls Guidelines}
\endlist
*/

14
src/imports/controls/doc/src/qtquickcontrols2-material.qdoc
View File

@ -67,10 +67,10 @@
\endtable
To run an application with the Material style, see
\l {Using Styles in Qt Quick Controls 2}.
\l {Using Styles in Qt Quick Controls}.
\note The Material style is not a native Android style. The Material
style is a 100% cross-platform Qt Quick Controls 2 style implementation that
style is a 100% cross-platform Qt Quick Controls style implementation that
follows the Google Material Design Guidelines. The style runs on any
platform, and looks more or less identical everywhere. Minor differences
may occur due to differences in available system fonts and font rendering
@ -124,14 +124,14 @@
\include qquickmaterialstyle.qdocinc conf
See \l {Qt Quick Controls 2 Configuration File} for more details about the
See \l {Qt Quick Controls Configuration File} for more details about the
configuration file.
\section3 Environment Variables
\include qquickmaterialstyle.qdocinc env
See \l {Supported Environment Variables in Qt Quick Controls 2} for the full
See \l {Supported Environment Variables in Qt Quick Controls} for the full
list of supported environment variables.
\section2 Dependency
@ -145,7 +145,7 @@
If the Material style is imported in a QML file that is always loaded, the
Material style must be deployed with the application in order to be able
to run the application regardless of which style the application is run with.
By using \l {Using File Selectors with Qt Quick Controls 2}{file selectors},
By using \l {Using File Selectors with Qt Quick Controls}{file selectors},
style-specific tweaks can be applied without creating a hard dependency to
a style.
@ -232,7 +232,7 @@
To use the dense variant, either set the
\c QT_QUICK_CONTROLS_MATERIAL_VARIANT environment variable to \c Dense,
or specify \c Variant=Dense in the
\l {Qt Quick Controls 2 Configuration File}{qtquickcontrols2.conf} file.
\l {Qt Quick Controls Configuration File}{qtquickcontrols2.conf} file.
The default value in both cases is \c Normal.
The following images illustrate the differences between some of the
@ -399,6 +399,6 @@
\section1 Related Information
\list
\li \l{Styling Qt Quick Controls 2}
\li \l{Styling Qt Quick Controls}
\endlist
*/

2
src/imports/controls/doc/src/qtquickcontrols2-navigation.qdoc
View File

@ -31,7 +31,7 @@
\ingroup qtquickcontrols2-guidelines
\brief Guidelines for navigation controls
Qt Quick Controls 2 offers a selection of navigation models.
Qt Quick Controls offers a selection of navigation models.
\annotatedlist qtquickcontrols2-navigation

2
src/imports/controls/doc/src/qtquickcontrols2-popups.qdoc
View File

@ -94,6 +94,6 @@
\section1 Related Information
\list
\li \l {Qt Quick Controls 2 Guidelines}
\li \l {Qt Quick Controls Guidelines}
\endlist
*/

12
src/imports/controls/doc/src/qtquickcontrols2-qmltypes.qdoc
View File

@ -31,13 +31,13 @@
\title Qt Quick Controls QML Types
\keyword Qt Quick Controls 2 QML Types
\ingroup qmlmodules
\brief Provides QML types for user interfaces (Qt Quick Controls 2).
\brief Provides QML types for user interfaces (Qt Quick Controls).
\l{Qt Quick Controls 2} provides QML types for creating user interfaces.
\l{Qt Quick Controls} provides QML types for creating user interfaces.
These QML types work in conjunction with \l{Qt Quick} and
\l{Qt Quick Layouts}.
Qt Quick Controls 2 QML types can be imported into your application
Qt Quick Controls QML types can be imported into your application
using the following import statement in your .qml file:
\badcode \QtMinorVersion
@ -48,11 +48,11 @@
\generatelist {qmltypesbymodule QtQuick.Controls}
\noautolist
For more information on the Qt Quick Controls 2 module, see the
\l {Qt Quick Controls 2} module documentation.
For more information on the Qt Quick Controls module, see the
\l {Qt Quick Controls} module documentation.
\section1 Related Information
\list
\li \l {Qt Quick Controls 2 Guidelines}
\li \l {Qt Quick Controls Guidelines}
\endlist
*/

4
src/imports/controls/doc/src/qtquickcontrols2-separators.qdoc
View File

@ -31,7 +31,7 @@
\ingroup qtquickcontrols2-guidelines
\brief Guidelines for separator controls
Qt Quick Controls 2 offers a selection of separators.
Qt Quick Controls offers a selection of separators.
\annotatedlist qtquickcontrols2-separators
@ -58,6 +58,6 @@
\section1 Related Information
\list
\li \l {Qt Quick Controls 2 Guidelines}
\li \l {Qt Quick Controls Guidelines}
\endlist
*/

32
src/imports/controls/doc/src/qtquickcontrols2-styles.qdoc
View File

@ -27,23 +27,23 @@
/*!
\page qtquickcontrols2-styles.html
\title Styling Qt Quick Controls 2
\title Styling Qt Quick Controls
\section1 Available Styles
Qt Quick Controls 2 comes with a selection of styles.
Qt Quick Controls comes with a selection of styles.
\section2 Default Style
\image qtquickcontrols2-default-thumbnail.png
The \l {Default Style} is a simple and light-weight all-round style that offers
the maximum performance for Qt Quick Controls 2.
the maximum performance for Qt Quick Controls.
\section2 Fusion Style
\image qtquickcontrols2-fusion-thumbnail.png
The \l {Fusion Style} is a platform-agnostic style that offers a desktop-oriented
look'n'feel for Qt Quick Controls 2.
look'n'feel for Qt Quick Controls.
\section2 Imagine Style
@ -67,7 +67,7 @@
\l {https://dev.windows.com/design}{Microsoft Universal Design Guidelines},
but requires more system resources than the Default style.
\section1 Using Styles in Qt Quick Controls 2
\section1 Using Styles in Qt Quick Controls
In order to run an application with a specific style, either configure the
style using \l QQuickStyle in C++, pass a command line argument, or set an
@ -81,7 +81,7 @@
\section2 Using QQuickStyle in C++
\l QQuickStyle provides C++ API for configuring a specific style. The following
example runs a Qt Quick Controls 2 application with the Material style:
example runs a Qt Quick Controls application with the Material style:
\code
QQuickStyle::setStyle("Material");
@ -93,7 +93,7 @@
Passing a \c -style command line argument is the convenient way to test different
styles. It takes precedence over the other methods listed below. The following
example runs a Qt Quick Controls 2 application with the Material style:
example runs a Qt Quick Controls application with the Material style:
\code
./app -style material
@ -103,19 +103,19 @@
Setting the \c QT_QUICK_CONTROLS_STYLE environment variable can be used to set
a system-wide style preference. It takes precedence over the configuration file
mentioned below. The following example runs a Qt Quick Controls 2 application with
mentioned below. The following example runs a Qt Quick Controls application with
the Universal style:
\code
QT_QUICK_CONTROLS_STYLE=universal ./app
\endcode
See \l {Supported Environment Variables in Qt Quick Controls 2} for the full list
See \l {Supported Environment Variables in Qt Quick Controls} for the full list
of supported environment variables.
\section2 Configuration file
Qt Quick Controls 2 support a special configuration file, \c :/qtquickcontrols2.conf,
Qt Quick Controls support a special configuration file, \c :/qtquickcontrols2.conf,
that is built into an application's resources.
The configuration file can specify the preferred style (may be overridden by either
@ -127,7 +127,7 @@
Style=Material
\endcode
See \l {Qt Quick Controls 2 Configuration File} for more details about the
See \l {Qt Quick Controls Configuration File} for more details about the
configuration file.
\section1 Related Information
@ -137,10 +137,10 @@
\li \l {Imagine Style}
\li \l {Material Style}
\li \l {Universal Style}
\li \l {Customizing Qt Quick Controls 2}
\li \l {Using File Selectors with Qt Quick Controls 2}
\li \l {Deploying Qt Quick Controls 2 Applications}
\li \l {Qt Quick Controls 2 Configuration File}
\li \l {Supported Environment Variables in Qt Quick Controls 2}
\li \l {Customizing Qt Quick Controls}
\li \l {Using File Selectors with Qt Quick Controls}
\li \l {Deploying Qt Quick Controls Applications}
\li \l {Qt Quick Controls Configuration File}
\li \l {Supported Environment Variables in Qt Quick Controls}
\endlist
*/

12
src/imports/controls/doc/src/qtquickcontrols2-universal.qdoc
View File

@ -66,10 +66,10 @@
\endtable
To run an application with the Universal style, see
\l {Using Styles in Qt Quick Controls 2}.
\l {Using Styles in Qt Quick Controls}.
\note The Universal style is not a native Windows 10 style. The Universal
style is a 100% cross-platform Qt Quick Controls 2 style implementation that
style is a 100% cross-platform Qt Quick Controls style implementation that
follows the Microsoft Universal Design Guidelines. The style runs on any
platform, and looks more or less identical everywhere. Minor differences
may occur due to differences in available system fonts and font rendering
@ -123,14 +123,14 @@
\include qquickuniversalstyle.qdocinc conf
See \l {Qt Quick Controls 2 Configuration File} for more details about the
See \l {Qt Quick Controls Configuration File} for more details about the
configuration file.
\section3 Environment Variables
\include qquickuniversalstyle.qdocinc env
See \l {Supported Environment Variables in Qt Quick Controls 2} for the full
See \l {Supported Environment Variables in Qt Quick Controls} for the full
list of supported environment variables.
\section2 Dependency
@ -144,7 +144,7 @@
If the Universal style is imported in a QML file that is always loaded, the
Universal style must be deployed with the application in order to be able
to run the application regardless of which style the application is run with.
By using \l {Using File Selectors with Qt Quick Controls 2}{file selectors},
By using \l {Using File Selectors with Qt Quick Controls}{file selectors},
style-specific tweaks can be applied without creating a hard dependency to
a style.
@ -283,6 +283,6 @@
\section1 Related Information
\list
\li \l{Styling Qt Quick Controls 2}
\li \l{Styling Qt Quick Controls}
\endlist
*/

2
src/imports/platform/doc/src/qtlabsplatform-index.qdoc
View File

@ -45,6 +45,6 @@
\list
\li \l{Qt Quick}
\li \l{Qt Quick Controls 2}
\li \l{Qt Quick Controls}
\endlist
*/

4
src/imports/platform/doc/src/qtlabsplatform-qmltypes.qdoc
View File

@ -33,7 +33,7 @@
The experimental \l{Qt Labs Platform} module provides QML types for native
platform extensions. These QML types work in conjunction with \l{Qt Quick}
and \l{Qt Quick Controls 2}.
and \l{Qt Quick Controls}.
The QML types can be imported into your application using the
following import statement in your .qml file:
@ -51,7 +51,7 @@
\section1 Related Information
\list
\li \l {Qt Quick Controls 2 QML Types}
\li \l {Qt Quick Controls QML Types}
\endlist
\noautolist

4
src/imports/templates/doc/src/qtquicktemplates2-index.qdoc
View File

@ -30,7 +30,7 @@
\title Qt Quick Templates 2
\brief A set of templates to create user interface controls in Qt Quick
Qt Quick Templates are the foundations of \l {Qt Quick Controls 2}. Templates
Qt Quick Templates are the foundations of \l {Qt Quick Controls}. Templates
are non-visual implementations of controls' logic and behavior. They offer
an interface to visualize the controls in QML using \l {Qt Quick}.
@ -48,7 +48,7 @@
\list
\li \l{Qt Quick}
\li \l{Qt Quick Controls 2}
\li \l{Qt Quick Controls}
\li \l{Qt Quick Templates 2 QML Types}
\endlist
*/

2
src/imports/templates/doc/src/qtquicktemplates2-qmltypes.qdoc
View File

@ -56,7 +56,7 @@
\section1 Related Information
\list
\li \l {Qt Quick Controls 2 QML Types}
\li \l {Qt Quick Controls QML Types}
\endlist
\noautolist

18
src/quickcontrols2/qquickstyle.cpp
View File

@ -64,7 +64,7 @@ QT_BEGIN_NAMESPACE
\since 5.7
QQuickStyle provides API for querying and configuring the application
\l {Styling Qt Quick Controls 2}{styles} of Qt Quick Controls 2.
\l {Styling Qt Quick Controls}{styles} of Qt Quick Controls.
\code
#include <QGuiApplication>
@ -86,7 +86,7 @@ QT_BEGIN_NAMESPACE
\endcode
\note The style must be configured \b before loading QML that imports
Qt Quick Controls 2. It is not possible to change the style after the QML
Qt Quick Controls. It is not possible to change the style after the QML
types have been registered.
The style can also be specified as a path to a custom style, such as
@ -102,7 +102,7 @@ QT_BEGIN_NAMESPACE
QQuickStyle::setFallbackStyle("Material");
\endcode
\sa {Styling Qt Quick Controls 2}
\sa {Styling Qt Quick Controls}
*/
static QStringList envPathList(const QByteArray &var)
@ -536,10 +536,10 @@ QString QQuickStyle::path()
/*!
Sets the application style to \a style.
\note The style must be configured \b before loading QML that imports Qt Quick Controls 2.
\note The style must be configured \b before loading QML that imports Qt Quick Controls.
It is not possible to change the style after the QML types have been registered.
\sa setFallbackStyle(), {Using Styles in Qt Quick Controls 2}
\sa setFallbackStyle(), {Using Styles in Qt Quick Controls}
*/
void QQuickStyle::setStyle(const QString &style)
{
@ -555,15 +555,15 @@ void QQuickStyle::setStyle(const QString &style)
\since 5.8
Sets the application fallback style to \a style.
\note The fallback style must be the name of one of the built-in Qt Quick Controls 2 styles, e.g. "Material".
\note The fallback style must be the name of one of the built-in Qt Quick Controls styles, e.g. "Material".
\note The style must be configured \b before loading QML that imports Qt Quick Controls 2.
\note The style must be configured \b before loading QML that imports Qt Quick Controls.
It is not possible to change the style after the QML types have been registered.
The fallback style can be also specified by setting the \c QT_QUICK_CONTROLS_FALLBACK_STYLE
\l {Supported Environment Variables in Qt Quick Controls 2}{environment variable}.
\l {Supported Environment Variables in Qt Quick Controls}{environment variable}.
\sa setStyle(), {Using Styles in Qt Quick Controls 2}
\sa setStyle(), {Using Styles in Qt Quick Controls}
*/
void QQuickStyle::setFallbackStyle(const QString &style)
{

2
src/quicktemplates2/qquickabstractbutton.cpp
View File

@ -736,7 +736,7 @@ void QQuickAbstractButton::setIndicator(QQuickItem *indicator)
\include qquickicon.qdocinc grouped-properties
\sa text, display, {Icons in Qt Quick Controls 2}
\sa text, display, {Icons in Qt Quick Controls}
*/
QQuickIcon QQuickAbstractButton::icon() const

2
src/quicktemplates2/qquickapplicationwindow.cpp
View File

@ -113,7 +113,7 @@ QT_BEGIN_NAMESPACE
attached properties works in any window regardless of its \c id.
\sa {Customizing ApplicationWindow}, Overlay, Page, {Container Controls},
{Focus Management in Qt Quick Controls 2}
{Focus Management in Qt Quick Controls}
*/
static const QQuickItemPrivate::ChangeTypes ItemChanges = QQuickItemPrivate::Visibility

2
src/quicktemplates2/qquickbutton.cpp
View File

@ -58,7 +58,7 @@ QT_BEGIN_NAMESPACE
\e Yes, \e No, and \e Help.
Button inherits its API from AbstractButton. For instance, you can set
\l {AbstractButton::text}{text}, display an \l {Icons in Qt Quick Controls 2}{icon},
\l {AbstractButton::text}{text}, display an \l {Icons in Qt Quick Controls}{icon},
and react to \l {AbstractButton::clicked}{clicks} using the AbstractButton API.
A button emits the signal \l {AbstractButton::}{clicked()} when it is activated by the user.

2
src/quicktemplates2/qquickcombobox.cpp
View File

@ -134,7 +134,7 @@ QT_BEGIN_NAMESPACE
\l textRole is not defined, ComboBox is unable to visualize it and throws a
\c {ReferenceError: modelData is not defined}.
\sa {Customizing ComboBox}, {Input Controls}, {Focus Management in Qt Quick Controls 2}
\sa {Customizing ComboBox}, {Input Controls}, {Focus Management in Qt Quick Controls}
*/
/*!

4
src/quicktemplates2/qquickcontrol.cpp
View File

@ -1470,9 +1470,9 @@ void QQuickControl::setHovered(bool hovered)
Setting this property propagates the value to all child controls that do not have
\c hoverEnabled explicitly set.
You can also enable or disable hover effects for all Qt Quick Controls 2 applications
You can also enable or disable hover effects for all Qt Quick Controls applications
by setting the \c QT_QUICK_CONTROLS_HOVER_ENABLED \l {Supported Environment Variables
in Qt Quick Controls 2}{environment variable}.
in Qt Quick Controls}{environment variable}.
\sa hovered
*/

2
src/quicktemplates2/qquickitemdelegate.cpp
View File

@ -56,7 +56,7 @@ QT_BEGIN_NAMESPACE
in various views and controls, such as \l ListView and \l ComboBox.
ItemDelegate inherits its API from AbstractButton. For instance, you can set
\l {AbstractButton::text}{text}, display an \l {Icons in Qt Quick Controls 2}{icon},
\l {AbstractButton::text}{text}, display an \l {Icons in Qt Quick Controls}{icon},
and react to \l {AbstractButton::clicked}{clicks} using the AbstractButton API.
\snippet qtquickcontrols2-itemdelegate.qml 1

2
src/quicktemplates2/qquickmenubar.cpp
View File

@ -73,7 +73,7 @@ QT_BEGIN_NAMESPACE
menus in a menu bar can be accessed using \l menuAt().
\sa {Customizing MenuBar}, Menu, MenuBarItem, {Menu Controls},
{Focus Management in Qt Quick Controls 2}
{Focus Management in Qt Quick Controls}
*/
QQuickItem *QQuickMenuBarPrivate::beginCreateItem()

2
src/quicktemplates2/qquickmenuitem.cpp
View File

@ -58,7 +58,7 @@ QT_BEGIN_NAMESPACE
example.
MenuItem inherits its API from AbstractButton. For instance, you can set
\l {AbstractButton::text}{text} and \l {Icons in Qt Quick Controls 2}{icon}
\l {AbstractButton::text}{text} and \l {Icons in Qt Quick Controls}{icon}
using the AbstractButton API.
\code

2
src/quicktemplates2/qquickpage.cpp
View File

@ -83,7 +83,7 @@ QT_BEGIN_NAMESPACE
\endqml
\sa ApplicationWindow, {Container Controls},
{Focus Management in Qt Quick Controls 2}
{Focus Management in Qt Quick Controls}
*/
static const QQuickItemPrivate::ChangeTypes LayoutChanges = QQuickItemPrivate::Geometry | QQuickItemPrivate::Visibility | QQuickItemPrivate::Destroyed

2
src/quicktemplates2/qquickpane.cpp
View File

@ -120,7 +120,7 @@ QT_BEGIN_NAMESPACE
\endcode
\sa {Customizing Pane}, {Container Controls},
{Focus Management in Qt Quick Controls 2}, {Event Handling}
{Focus Management in Qt Quick Controls}, {Event Handling}
*/
void QQuickPanePrivate::init()

2
src/quicktemplates2/qquickrangeslider.cpp
View File

@ -89,7 +89,7 @@ QT_BEGIN_NAMESPACE
For a slider that allows the user to select a single value, see \l Slider.
\sa {Customizing RangeSlider}, {Input Controls},
{Focus Management in Qt Quick Controls 2}
{Focus Management in Qt Quick Controls}
*/
class QQuickRangeSliderNodePrivate : public QObjectPrivate

2
src/quicktemplates2/qquickscrollview.cpp
View File

@ -113,7 +113,7 @@ QT_BEGIN_NAMESPACE
\snippet qtquickcontrols2-scrollview-interactive.qml file
\sa ScrollBar, ScrollIndicator, {Customizing ScrollView}, {Container Controls},
{Focus Management in Qt Quick Controls 2}
{Focus Management in Qt Quick Controls}
*/
class QQuickScrollViewPrivate : public QQuickPanePrivate

2
src/quicktemplates2/qquickspinbox.cpp
View File

@ -92,7 +92,7 @@ static const int AUTO_REPEAT_INTERVAL = 100;
\snippet qtquickcontrols2-spinbox-double.qml 1
\sa Tumbler, {Customizing SpinBox}, {Focus Management in Qt Quick Controls 2}
\sa Tumbler, {Customizing SpinBox}, {Focus Management in Qt Quick Controls}
*/
/*!

2
src/quicktemplates2/qquickstackview.cpp
View File

@ -373,7 +373,7 @@ QT_BEGIN_NAMESPACE
\endlist
\sa {Customizing StackView}, {Navigation Controls}, {Container Controls},
{Focus Management in Qt Quick Controls 2}
{Focus Management in Qt Quick Controls}
*/
QQuickStackView::QQuickStackView(QQuickItem *parent)

2
src/quicktemplates2/qquickswipeview.cpp
View File

@ -100,7 +100,7 @@ QT_BEGIN_NAMESPACE
or using anchors for its children works as expected.
\sa TabBar, PageIndicator, {Customizing SwipeView}, {Navigation Controls}, {Container Controls},
{Focus Management in Qt Quick Controls 2}
{Focus Management in Qt Quick Controls}
*/
class QQuickSwipeViewPrivate : public QQuickContainerPrivate

2
src/quicktemplates2/qquicktabbar.cpp
View File

@ -92,7 +92,7 @@ QT_BEGIN_NAMESPACE
\snippet qtquickcontrols2-tabbar-flickable.qml 1
\sa TabButton, {Customizing TabBar}, {Navigation Controls}, {Container Controls},
{Focus Management in Qt Quick Controls 2}
{Focus Management in Qt Quick Controls}
*/
class QQuickTabBarPrivate : public QQuickContainerPrivate

2
src/quicktemplates2/qquicktoolbutton.cpp
View File

@ -58,7 +58,7 @@ QT_BEGIN_NAMESPACE
\snippet qtquickcontrols2-toolbar.qml 1
ToolButton inherits its API from AbstractButton. For instance, you can set
\l {AbstractButton::text}{text}, display an \l {Icons in Qt Quick Controls 2}{icon},
\l {AbstractButton::text}{text}, display an \l {Icons in Qt Quick Controls}{icon},
and react to \l {AbstractButton::clicked}{clicks} using the AbstractButton API.
\sa ToolBar, {Customizing ToolButton}, {Button Controls}