Merge remote-tracking branch 'origin/dev' into wip/cmake

Removed dependencies.yaml.

Change-Id: I1e2b3f486e9ace4bc8dc0419a64848990b3a6b39

1 files changed, 6 insertions, 6 deletions

diff --git a/src/imports/controls/doc/src/qtquickcontrols2-qmltypes.qdoc b/src/imports/controls/doc/src/qtquickcontrols2-qmltypes.qdoc
index a28b2974..c8c44264 100644
--- a/src/imports/controls/doc/src/qtquickcontrols2-qmltypes.qdoc
+++ b/src/imports/controls/doc/src/qtquickcontrols2-qmltypes.qdoc
@@ -31,13 +31,13 @@
     \title Qt Quick Controls QML Types
     \keyword Qt Quick Controls 2 QML Types
     \ingroup qmlmodules
-    \brief Provides QML types for user interfaces (Qt Quick Controls 2).
+    \brief Provides QML types for user interfaces (Qt Quick Controls).
 
-    \l{Qt Quick Controls 2} provides QML types for creating user interfaces.
+    \l{Qt Quick Controls} provides QML types for creating user interfaces.
     These QML types work in conjunction with \l{Qt Quick} and
     \l{Qt Quick Layouts}.
 
-    Qt Quick Controls 2 QML types can be imported into your application
+    Qt Quick Controls QML types can be imported into your application
     using the following import statement in your .qml file:
 
     \badcode \QtMinorVersion
@@ -48,11 +48,11 @@
     \generatelist {qmltypesbymodule QtQuick.Controls}
     \noautolist
 
-    For more information on the Qt Quick Controls 2 module, see the
-    \l {Qt Quick Controls 2} module documentation.
+    For more information on the Qt Quick Controls module, see the
+    \l {Qt Quick Controls} module documentation.
 
     \section1 Related Information
     \list
-    \li \l {Qt Quick Controls 2 Guidelines}
+    \li \l {Qt Quick Controls Guidelines}
     \endlist
 */