diff options
author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-09-06 13:31:44 +0200 |
---|---|---|
committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-09-06 13:31:51 +0200 |
commit | e15a6a37d297bb466b96c3baf6073cc971c56ba2 (patch) | |
tree | 4ab8ca921336f38ca539b699c6f4c0d7dc3de949 /src/imports/controls/doc/src/qtquickcontrols2-material.qdoc | |
parent | 94fdd09199b3373bc6d6e9d9c873cd16d54184a5 (diff) | |
parent | 3703d57161dc4ad7df000403bfcc43ac78eb6617 (diff) |
Merge "Merge remote-tracking branch 'origin/5.13' into 5.14"
Diffstat (limited to 'src/imports/controls/doc/src/qtquickcontrols2-material.qdoc')
-rw-r--r-- | src/imports/controls/doc/src/qtquickcontrols2-material.qdoc | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/imports/controls/doc/src/qtquickcontrols2-material.qdoc b/src/imports/controls/doc/src/qtquickcontrols2-material.qdoc index d9e34a5f..a146843a 100644 --- a/src/imports/controls/doc/src/qtquickcontrols2-material.qdoc +++ b/src/imports/controls/doc/src/qtquickcontrols2-material.qdoc @@ -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 */ |