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 --- src/imports/controls/doc/src/qtquickcontrols2-icons.qdoc | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) (limited to 'src/imports/controls/doc/src/qtquickcontrols2-icons.qdoc') 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 */ -- cgit v1.2.3