diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-09-07 18:51:21 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-09-07 18:51:21 +0200 |
| commit | 42aaff003d27ed9ba75d48a4e02a83fd5c1eade9 (patch) | |
| tree | 2c8a5d2ec58e7be3c3af51f88cf6d05864df6f34 /src/imports/controls/doc/src/qtquickcontrols2-fileselectors.qdoc | |
| parent | 6b55e00eb94b138f39becac1bddaa5f3e42136dc (diff) | |
| parent | e15a6a37d297bb466b96c3baf6073cc971c56ba2 (diff) | |
Merge remote-tracking branch 'origin/5.14' into 5.15
Change-Id: I23522a8f71cea8d8e3f0155dad98e41c003774fb
Diffstat (limited to 'src/imports/controls/doc/src/qtquickcontrols2-fileselectors.qdoc')
| -rw-r--r-- | src/imports/controls/doc/src/qtquickcontrols2-fileselectors.qdoc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/imports/controls/doc/src/qtquickcontrols2-fileselectors.qdoc b/src/imports/controls/doc/src/qtquickcontrols2-fileselectors.qdoc index cfcfa149..d73d1abe 100644 --- a/src/imports/controls/doc/src/qtquickcontrols2-fileselectors.qdoc +++ b/src/imports/controls/doc/src/qtquickcontrols2-fileselectors.qdoc @@ -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 */ |