From f74cff42a76a363d98055b2d10ea4d5b96532f2d Mon Sep 17 00:00:00 2001 From: Venugopal Shivashankar Date: Mon, 12 Aug 2019 16:05:44 +0200 Subject: 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 --- .../controls/doc/src/qtquickcontrols2-styles.qdoc | 32 +++++++++++----------- 1 file changed, 16 insertions(+), 16 deletions(-) (limited to 'src/imports/controls/doc/src/qtquickcontrols2-styles.qdoc') diff --git a/src/imports/controls/doc/src/qtquickcontrols2-styles.qdoc b/src/imports/controls/doc/src/qtquickcontrols2-styles.qdoc index a1a74ec9..27731e42 100644 --- a/src/imports/controls/doc/src/qtquickcontrols2-styles.qdoc +++ b/src/imports/controls/doc/src/qtquickcontrols2-styles.qdoc @@ -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 */ -- cgit v1.2.3