summaryrefslogtreecommitdiff
path: root/src/controls/doc/src/qtquickcontrols.qdoc
diff options
context:
space:
mode:
authorQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2019-12-07 03:02:37 +0100
committerQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2019-12-07 03:02:37 +0100
commit5a99e380a536ad9e6af83e89902ede8083d3d376 (patch)
treee40231db50a979047bef95e5dd1a891e1a70253b /src/controls/doc/src/qtquickcontrols.qdoc
parent0ad5e87fc5b7d9ecef42ad376278858cad7e1973 (diff)
parent52e5dc73b3f61e0453eb939314c3ea67b02ce7e3 (diff)
downloadqtquickcontrols-5a99e380a536ad9e6af83e89902ede8083d3d376.tar.gz
Merge remote-tracking branch 'origin/5.14' into 5.15
Change-Id: Ided88edd678ef05c3f69cfa374b8a79e64f5c812
Diffstat (limited to 'src/controls/doc/src/qtquickcontrols.qdoc')
-rw-r--r--src/controls/doc/src/qtquickcontrols.qdoc2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/controls/doc/src/qtquickcontrols.qdoc b/src/controls/doc/src/qtquickcontrols.qdoc
index a57521d1..92606e47 100644
--- a/src/controls/doc/src/qtquickcontrols.qdoc
+++ b/src/controls/doc/src/qtquickcontrols.qdoc
@@ -31,6 +31,8 @@
\ingroup qmlmodules
\brief Provides QML types for user interfaces.
+ \deprecationwarning
+
The \l{Qt Quick Controls 1} module provides QML types for creating user
interfaces. These QML types work in conjunction with \l{Qt Quick} and
\l{Qt Quick Layouts}.