diff options
| author | Venugopal Shivashankar <Venugopal.Shivashankar@qt.io> | 2018-10-29 14:03:14 +0100 |
|---|---|---|
| committer | Jani Heikkinen <jani.heikkinen@qt.io> | 2018-10-31 08:20:06 +0000 |
| commit | ba82980c6060a9b1169dd797cca8e8371caa488b (patch) | |
| tree | 89b281a99537be9000c62fe7c6bed6ccb6e97069 | |
| parent | d079900f11f83d1bda8ec52902716d7ebb02310b (diff) | |
| download | qtdoc-ba82980c6060a9b1169dd797cca8e8371caa488b.tar.gz | |
Doc: Remove references to the Qt Quick Controls 1
These are topics that a beginner will bump into so referring to
Qt Quick Controls 2 is apt here as the earlier is deprecated.
Task-number: QTBUG-70333
Change-Id: I9241f95ce4386bea98f3f783694581e0753c19db
Reviewed-by: Paul Wicking <paul.wicking@qt.io>
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| -rw-r--r-- | doc/src/qmlapp/applicationdevelopers.qdoc | 17 | ||||
| -rw-r--r-- | doc/src/userinterfaces.qdoc | 10 |
2 files changed, 6 insertions, 21 deletions
diff --git a/doc/src/qmlapp/applicationdevelopers.qdoc b/doc/src/qmlapp/applicationdevelopers.qdoc index d3602849..9edf0f45 100644 --- a/doc/src/qmlapp/applicationdevelopers.qdoc +++ b/doc/src/qmlapp/applicationdevelopers.qdoc @@ -94,20 +94,9 @@ version 2.7 and onwards. \section2 Buttons, Menus, and other Controls For a set of basic UI controls, the \l{Qt Quick Controls} module implements -several controls such as buttons, menus, and views. These controls mimic the -native behavior found in different platforms such as Windows, \macos, and Linux. - -\list -\li \l{Qt Quick Controls 1 Overview} -\li \l{Qt Quick Controls 1 Styles}{Styles} -\li \l{Qt Quick Dialogs}{Dialogs} -\li \l{Qt Quick Layouts}{Layouts} -\li \l{Qt Quick Extras}{Extras} -\endlist - -A second set of UI controls, \e {Qt Quick Controls 2}, was designed for use -on embedded systems, where the hardware has limited resources. For a comparison -of the two sets of controls, see \l {Differences between Qt Quick Controls}. +several controls such as buttons, menus, and views. These controls come with +several built-in styles that can be used, and also support the creation +of custom styles. \list \li \l{Qt Quick Controls 2 Guidelines} diff --git a/doc/src/userinterfaces.qdoc b/doc/src/userinterfaces.qdoc index 3018b1d3..4ff9e411 100644 --- a/doc/src/userinterfaces.qdoc +++ b/doc/src/userinterfaces.qdoc @@ -73,13 +73,9 @@ and shader effects. \section2 Graphical Controls -The \l{Qt Quick Controls} module (since Qt 5.1) provides a set of UI elements to -create user interfaces for desktop and mobile platforms using \l{Qt Quick} 2. -The \l{Qt Quick Controls 2} module (since Qt 5.7) provides lightweight QML types -for creating performant user interfaces for embedded and mobile devices. These -controls achieve improved efficiency by employing a simplified styling -architecture when compared to the first set of controls. For a comparison -of the two sets of controls, see \l {Differences between Qt Quick Controls}. +The \l{Qt Quick Controls} module (since Qt 5.7) provides lightweight QML types +for creating performant user interfaces. These controls achieve improved +efficiency by employing a simplified styling architecture. For more about how to create application user interfaces with QML, visit the \l{QML User Interfaces} page. |