diff options
17 files changed, 42 insertions, 42 deletions
diff --git a/src/controls/qquickstyle.cpp b/src/controls/qquickstyle.cpp index e6be5efd..d6a966ea 100644 --- a/src/controls/qquickstyle.cpp +++ b/src/controls/qquickstyle.cpp @@ -50,7 +50,7 @@ QT_BEGIN_NAMESPACE \inmodule QtLabsControls QQuickStyle provides API for querying and configuring the application - \l {Styling Qt Labs Controls}{styles} of Qt Labs Controls. + \l {Styling Qt Quick Controls 2}{styles} of Qt Quick Controls 2. \code #include <QGuiApplication> @@ -72,10 +72,10 @@ QT_BEGIN_NAMESPACE \endcode \note The style must be configured \b before loading QML that imports - Qt Labs Controls. It is not possible to change the style after the QML + Qt Quick Controls 2. It is not possible to change the style after the QML types have been registered. - \sa {Styling Qt Labs Controls} + \sa {Styling Qt Quick Controls 2} */ struct QQuickStyleSpec @@ -138,7 +138,7 @@ QString QQuickStyle::name() /*! Returns the path of an overridden application style, or an empty - string if the style is one of the built-in Qt Labs Controls styles. + string if the style is one of the built-in Qt Quick Controls 2 styles. \note The application style can be specified by passing a \c -style command line argument. Therefore \c path() may not return a fully resolved @@ -152,7 +152,7 @@ QString QQuickStyle::path() /*! Sets the application style. - \note The style must be configured \b before loading QML that imports Qt Labs Controls. + \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 types have been registered. */ void QQuickStyle::setStyle(const QString &style) diff --git a/src/imports/controls/doc/src/qtquickcontrols2-buttons.qdoc b/src/imports/controls/doc/src/qtquickcontrols2-buttons.qdoc index a1d642ac..9e7872d7 100644 --- a/src/imports/controls/doc/src/qtquickcontrols2-buttons.qdoc +++ b/src/imports/controls/doc/src/qtquickcontrols2-buttons.qdoc @@ -29,7 +29,7 @@ \page qtquickcontrols2-buttons.html \title Button Controls - Qt Labs Controls offers a selection of button-like controls. + Qt Quick Controls 2 offers a selection of button-like controls. \annotatedlist qtlabscontrols-buttons diff --git a/src/imports/controls/doc/src/qtquickcontrols2-containers.qdoc b/src/imports/controls/doc/src/qtquickcontrols2-containers.qdoc index 6a136597..9a9a6bd6 100644 --- a/src/imports/controls/doc/src/qtquickcontrols2-containers.qdoc +++ b/src/imports/controls/doc/src/qtquickcontrols2-containers.qdoc @@ -29,7 +29,7 @@ \page qtquickcontrols2-containers.html \title Container Controls - Qt Labs Controls offers a selection of container-like controls. + Qt Quick Controls 2 offers a selection of container-like controls. \annotatedlist qtlabscontrols-containers diff --git a/src/imports/controls/doc/src/qtquickcontrols2-customize.qdoc b/src/imports/controls/doc/src/qtquickcontrols2-customize.qdoc index 0a0cd13d..855c3c6d 100644 --- a/src/imports/controls/doc/src/qtquickcontrols2-customize.qdoc +++ b/src/imports/controls/doc/src/qtquickcontrols2-customize.qdoc @@ -30,7 +30,7 @@ \title Customizing Qt Quick Controls 2 \brief A set of UI controls to create user interfaces in Qt Quick - Qt Labs Controls consist of a hierarchy (tree) of items. In order to + Qt Quick Controls 2 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. The following snippets present the default implementations of various items. These can be used as a diff --git a/src/imports/controls/doc/src/qtquickcontrols2-default.qdoc b/src/imports/controls/doc/src/qtquickcontrols2-default.qdoc index d4f61fda..daa063ed 100644 --- a/src/imports/controls/doc/src/qtquickcontrols2-default.qdoc +++ b/src/imports/controls/doc/src/qtquickcontrols2-default.qdoc @@ -32,14 +32,14 @@ The Default style is a basic all-round style. The Default style a simple and light-weight style that offers the maximum - performance for Qt Labs Controls. It is built with a minimal amount of Qt + performance for Qt Quick Controls 2. It is built with a minimal amount of Qt Quick primitives, and keeps animations and transitions to the minimum. \image qtquickcontrols-default.png - The style is selected by default when running Qt Labs Controls applications. + The style is selected by default when running Qt Quick Controls 2 applications. It is built into the module's resources, so by default it is shipped with - any application that depends on the Qt Labs Controls module + any application that depends on the Qt Quick Controls 2 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 diff --git a/src/imports/controls/doc/src/qtquickcontrols2-differences.qdoc b/src/imports/controls/doc/src/qtquickcontrols2-differences.qdoc index 4c07d199..8bdf1f63 100644 --- a/src/imports/controls/doc/src/qtquickcontrols2-differences.qdoc +++ b/src/imports/controls/doc/src/qtquickcontrols2-differences.qdoc @@ -36,7 +36,7 @@ or platform-independent style. On embedded systems, where the hardware has limited resources, this approach - can be inefficient. Qt Labs Controls were designed to solve this problem, + can be inefficient. Qt Quick Controls 2 were 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. @@ -57,7 +57,7 @@ create their own complete style can copy the folder and start tweaking. Read more about implementing a style plugin {TODO}{here}. - In Qt Labs Controls, styles no longer provide components that are + In Qt Quick Controls 2, 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 @@ -88,7 +88,7 @@ } \endqml - The API of Qt Labs Controls aims to be clean and simple. Common + The API of Qt Quick Controls 2 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. @@ -98,7 +98,7 @@ \header \li \li Qt Quick Controls - \li Qt Labs Controls + \li Qt Quick Controls 2 \row \li Stylable delegates \li Yes @@ -133,7 +133,7 @@ \section2 Porting Qt Quick Controls Code - The API of Qt Labs Controls is very similar to Qt Quick Controls, but it + The API of Qt Quick Controls 2 is very similar to Qt Quick Controls, 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 @@ -151,7 +151,7 @@ } \endcode - To style a button in Qt Labs Controls: + To style a button in Qt Quick Controls 2: \qml Button { @@ -184,7 +184,7 @@ \table \header \li Qt Quick Controls - \li Qt Labs Controls + \li Qt Quick Controls 2 \row \li \l [QtQuickControls] {Action} \li No equivalent; see \l [QtQuick] {Shortcut} instead. diff --git a/src/imports/controls/doc/src/qtquickcontrols2-fileselectors.qdoc b/src/imports/controls/doc/src/qtquickcontrols2-fileselectors.qdoc index fc95f7b8..85f4fa85 100644 --- a/src/imports/controls/doc/src/qtquickcontrols2-fileselectors.qdoc +++ b/src/imports/controls/doc/src/qtquickcontrols2-fileselectors.qdoc @@ -31,7 +31,7 @@ \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 Labs Controls extends the built-in selectors with the name + selectors. Qt Quick Controls 2 extends the built-in selectors with the name 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 - Labs Controls}{Qt Labs Controls styles}. + Quick Controls 2}{Qt Quick Controls 2 styles}. The following example demonstrates a custom rounded button that has a styled drop shadow in the \l {Material Style}{Material style}, and looks diff --git a/src/imports/controls/doc/src/qtquickcontrols2-gettingstarted.qdoc b/src/imports/controls/doc/src/qtquickcontrols2-gettingstarted.qdoc index 1267a94b..4661e8c9 100644 --- a/src/imports/controls/doc/src/qtquickcontrols2-gettingstarted.qdoc +++ b/src/imports/controls/doc/src/qtquickcontrols2-gettingstarted.qdoc @@ -39,7 +39,7 @@ C++ application, doing this means you can only set window properties from C++. - With Qt Labs Controls, declare an ApplicationWindow as the root item of + With Qt Quick Controls 2, 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. diff --git a/src/imports/controls/doc/src/qtquickcontrols2-highdpi.qdoc b/src/imports/controls/doc/src/qtquickcontrols2-highdpi.qdoc index e0e26a0b..301337e4 100644 --- a/src/imports/controls/doc/src/qtquickcontrols2-highdpi.qdoc +++ b/src/imports/controls/doc/src/qtquickcontrols2-highdpi.qdoc @@ -29,7 +29,7 @@ \page qtquickcontrols2-highdpi.html \title High-DPI Support in Qt Quick Controls 2 - Qt Labs Controls support Qt's cross-platform high-DPI scaling introduced in Qt 5.6. + Qt Quick Controls 2 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 +52,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 Labs Controls. + support in applications wishing to mix Qt Quick Controls and Qt Quick Controls 2. \section1 Related Information \list diff --git a/src/imports/controls/doc/src/qtquickcontrols2-index.qdoc b/src/imports/controls/doc/src/qtquickcontrols2-index.qdoc index 0ecb5b53..a7bad347 100644 --- a/src/imports/controls/doc/src/qtquickcontrols2-index.qdoc +++ b/src/imports/controls/doc/src/qtquickcontrols2-index.qdoc @@ -31,7 +31,7 @@ \brief Provides a set of UI controls for Qt Quick. - Qt Labs Controls provides a set of controls that can be used + Qt Quick Controls 2 provides a set of controls that can be used to build complete interfaces in Qt Quick. \section1 QML Types @@ -42,7 +42,7 @@ \section2 Qt.labs.calendar Module \generatelist {qmltypesbymodule Qt.labs.calendar} - \section1 Important Concepts in Qt Labs Controls + \section1 Important Concepts in Qt Quick Controls 2 \list \li \l{Getting Started with Qt Quick Controls 2} diff --git a/src/imports/controls/doc/src/qtquickcontrols2-indicators.qdoc b/src/imports/controls/doc/src/qtquickcontrols2-indicators.qdoc index 3a2fcb66..6b67c317 100644 --- a/src/imports/controls/doc/src/qtquickcontrols2-indicators.qdoc +++ b/src/imports/controls/doc/src/qtquickcontrols2-indicators.qdoc @@ -29,7 +29,7 @@ \page qtquickcontrols2-indicators.html \title Indicator Controls - Qt Labs Controls offers a selection of indicator-like controls. + Qt Quick Controls 2 offers a selection of indicator-like controls. \annotatedlist qtlabscontrols-indicators diff --git a/src/imports/controls/doc/src/qtquickcontrols2-input.qdoc b/src/imports/controls/doc/src/qtquickcontrols2-input.qdoc index 77eba230..c9773a5f 100644 --- a/src/imports/controls/doc/src/qtquickcontrols2-input.qdoc +++ b/src/imports/controls/doc/src/qtquickcontrols2-input.qdoc @@ -29,7 +29,7 @@ \page qtquickcontrols2-input.html \title Input Controls - Qt Labs Controls offers a variety of input controls for both numeric + Qt Quick Controls 2 offers a variety of input controls for both numeric and textual input. \annotatedlist qtlabscontrols-input diff --git a/src/imports/controls/doc/src/qtquickcontrols2-material.qdoc b/src/imports/controls/doc/src/qtquickcontrols2-material.qdoc index b669ed53..afa207a9 100644 --- a/src/imports/controls/doc/src/qtquickcontrols2-material.qdoc +++ b/src/imports/controls/doc/src/qtquickcontrols2-material.qdoc @@ -52,7 +52,7 @@ \caption The Material style in light and dark themes \note The Material style is not a native Android style. The Material - style is a 100% cross-platform Qt Labs Controls style implementation that + style is a 100% cross-platform Qt Quick Controls 2 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 @@ -153,7 +153,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 Labs Controls}{file selectors}, + By using \l {Using File Selectors with Qt Quick Controls 2}{file selectors}, style-specific tweaks can be applied without creating a hard dependency to a style. diff --git a/src/imports/controls/doc/src/qtquickcontrols2-navigation.qdoc b/src/imports/controls/doc/src/qtquickcontrols2-navigation.qdoc index bf5d59e4..afb82c53 100644 --- a/src/imports/controls/doc/src/qtquickcontrols2-navigation.qdoc +++ b/src/imports/controls/doc/src/qtquickcontrols2-navigation.qdoc @@ -29,7 +29,7 @@ \page qtquickcontrols2-navigation.html \title Navigation Controls - Qt Labs Controls offers a selection of navigation models. + Qt Quick Controls 2 offers a selection of navigation models. \annotatedlist qtlabscontrols-navigation diff --git a/src/imports/controls/doc/src/qtquickcontrols2-styles.qdoc b/src/imports/controls/doc/src/qtquickcontrols2-styles.qdoc index b38b047c..46a538b4 100644 --- a/src/imports/controls/doc/src/qtquickcontrols2-styles.qdoc +++ b/src/imports/controls/doc/src/qtquickcontrols2-styles.qdoc @@ -29,9 +29,9 @@ \page qtquickcontrols2-styles.html \title Styling Qt Quick Controls 2 - Qt Labs Controls comes with a selection of styles. The \l {Default Style} + Qt Quick Controls 2 comes with a selection of styles. The \l {Default Style} {Default} style is a simple and light-weight all-round style that offers - the maximum performance for Qt Labs Controls. The more advanced + the maximum performance for Qt Quick Controls 2. The more advanced \l {Universal Style}{Universal} and \l {Material Style}{Material} styles offer an appealing design, but require more system resources. @@ -49,7 +49,7 @@ \section2 Using QQuickStyle in C++ \l QQuickStyle provides API configuring a specific style. The following - example runs a Qt Labs Controls application with the Material style: + example runs a Qt Quick Controls 2 application with the Material style: \code #include <QGuiApplication> @@ -74,7 +74,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 Labs Controls application with the Material style: + example runs a Qt Quick Controls 2 application with the Material style: \code ./app -style material @@ -84,7 +84,7 @@ Setting the \c QT_LABS_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 Labs Controls application with + mentioned below. The following example runs a Qt Quick Controls 2 application with the Universal style: \code @@ -94,7 +94,7 @@ \section2 Configuration file \target qtlabscontrols-conf - Qt Labs Controls support a special configuration file, \c :/qtquickcontrols.conf, + Qt Quick Controls 2 support a special configuration file, \c :/qtquickcontrols.conf, that is built into an application's resources. The configuration file can specify the preferred style (may be overridden by either @@ -117,7 +117,7 @@ Accent=Brown \endcode - In order to make it possible for Qt Labs Controls to find the configuration file, + In order to make it possible for Qt Quick Controls 2 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: @@ -129,7 +129,7 @@ </RCC> \endcode - \note Qt Labs Controls uses a file selector to load the configuration file. It + \note Qt Quick Controls 2 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. diff --git a/src/imports/controls/doc/src/qtquickcontrols2-universal.qdoc b/src/imports/controls/doc/src/qtquickcontrols2-universal.qdoc index 8f227ea7..cf0a7377 100644 --- a/src/imports/controls/doc/src/qtquickcontrols2-universal.qdoc +++ b/src/imports/controls/doc/src/qtquickcontrols2-universal.qdoc @@ -52,7 +52,7 @@ \caption The Universal style in light and dark themes \note The Universal style is not a native Windows 10 style. The Universal - style is a 100% cross-platform Qt Labs Controls style implementation that + style is a 100% cross-platform Qt Quick Controls 2 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 @@ -148,7 +148,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 Labs Controls}{file selectors}, + By using \l {Using File Selectors with Qt Quick Controls 2}{file selectors}, style-specific tweaks can be applied without creating a hard dependency to a style. diff --git a/src/imports/controls/doc/src/qtquickcontrols2.qdoc b/src/imports/controls/doc/src/qtquickcontrols2.qdoc index 6ae64929..8bcd12cf 100644 --- a/src/imports/controls/doc/src/qtquickcontrols2.qdoc +++ b/src/imports/controls/doc/src/qtquickcontrols2.qdoc @@ -29,13 +29,13 @@ \qmlmodule Qt.labs.controls 1.0 \title Qt Quick Controls 2 QML Types \ingroup qmlmodules - \brief Provides QML types for user interfaces (Qt Labs Controls). + \brief Provides QML types for user interfaces (Qt Quick Controls 2). \l{Qt Quick Controls 2} provides QML types for creating user interfaces. These QML types work in conjunction with \l{Qt Quick} and \l{Qt Quick Layouts}. - Qt Labs Controls QML types can be imported into your application + Qt Quick Controls 2 QML types can be imported into your application using the following import statement in your .qml file: \badcode |