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:45 +0200 |
| commit | 3703d57161dc4ad7df000403bfcc43ac78eb6617 (patch) | |
| tree | 4ab8ca921336f38ca539b699c6f4c0d7dc3de949 /src/imports/controls/doc/src/qtquickcontrols2-icons.qdoc | |
| parent | 94fdd09199b3373bc6d6e9d9c873cd16d54184a5 (diff) | |
| parent | 567a5cf69ef39ba5e9d0558ee7d6caec4d69bf71 (diff) | |
Merge remote-tracking branch 'origin/5.13' into 5.14
Change-Id: Ie9314e1a5daa20cee9d95a3c42873dbe515b3333
Diffstat (limited to 'src/imports/controls/doc/src/qtquickcontrols2-icons.qdoc')
| -rw-r--r-- | src/imports/controls/doc/src/qtquickcontrols2-icons.qdoc | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/src/imports/controls/doc/src/qtquickcontrols2-icons.qdoc b/src/imports/controls/doc/src/qtquickcontrols2-icons.qdoc index 5e62a2ce..f8cb1f52 100644 --- a/src/imports/controls/doc/src/qtquickcontrols2-icons.qdoc +++ b/src/imports/controls/doc/src/qtquickcontrols2-icons.qdoc @@ -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 */ |