summaryrefslogtreecommitdiff
path: root/doc/src/qtquick/qtquick-components.qdoc
diff options
context:
space:
mode:
authorTim Jenssen <tim.jenssen@qt.io>2016-09-30 14:23:05 +0200
committerTim Jenssen <tim.jenssen@qt.io>2016-09-30 13:28:18 +0000
commit3b503d87f24b5f63d56474f156e212d8c47b41a1 (patch)
treeff53afba85a66b1412e1204c6d32ecbd527d4c57 /doc/src/qtquick/qtquick-components.qdoc
parent8288d1692de00961ad5131fabe4ab3a9d19f5e7b (diff)
downloadqt-creator-3b503d87f24b5f63d56474f156e212d8c47b41a1.tar.gz
Doc: remove Qt Labs Controls advices
It was just a testballoon and they are living as Qt Quick Controls 2 in newer Qt versions. Change-Id: Ic65a7af0866be5e1427e3165ab588ee28c2db051 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
Diffstat (limited to 'doc/src/qtquick/qtquick-components.qdoc')
-rw-r--r--doc/src/qtquick/qtquick-components.qdoc6
1 files changed, 2 insertions, 4 deletions
diff --git a/doc/src/qtquick/qtquick-components.qdoc b/doc/src/qtquick/qtquick-components.qdoc
index dbc41d57f8..264a3640f5 100644
--- a/doc/src/qtquick/qtquick-components.qdoc
+++ b/doc/src/qtquick/qtquick-components.qdoc
@@ -84,15 +84,13 @@
creating classic desktop-style user interfaces using Qt Quick 2.1. You can
use the Qt Quick Controls Styles to customize Qt Quick Controls.
- Since Qt 5.6, Qt Labs Controls provide lightweight QML types for creating
+ Since Qt 5.7, \l {Qt Quick Controls 2} replace Qt Quick Controls 1 and
+ Qt Labs Controls. These Controls provide 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 Qt Quick Controls, on which the module is based. These
types work in conjunction with Qt Quick and Qt Quick Layouts.
- Since Qt 5.7, \l {Qt Quick Controls 2} replace Qt Quick Controls 1 and
- Qt Labs Controls.
-
Some ready-made controls, such as a gauge, dial, status indicator, and
tumbler, are provided by the \l {Qt Quick Extras} module.