Merge remote-tracking branch 'origin/5.12' into dev

Change-Id: I4ebc848bf78a74fb26a630d8a4839f104612ff74

30 files changed, 190 insertions, 101 deletions

diff --git a/examples/quickcontrols2/chattutorial/doc/src/qtquickcontrols2-chattutorial.qdoc b/examples/quickcontrols2/chattutorial/doc/src/qtquickcontrols2-chattutorial.qdoc
index 519d1c7a..aea27d94 100644
--- a/examples/quickcontrols2/chattutorial/doc/src/qtquickcontrols2-chattutorial.qdoc
+++ b/examples/quickcontrols2/chattutorial/doc/src/qtquickcontrols2-chattutorial.qdoc
@@ -27,7 +27,8 @@
 
 /*!
 \example chattutorial
-\title Qt Quick Controls 2 - Chat Tutorial
+\keyword Qt Quick Controls - Chat Tutorial
+    \title Qt Quick Controls 2 - Chat Tutorial
 \brief Tutorial about writing a basic chat client using Qt Quick Controls 2.
 \ingroup qtquickcontrols2-examples
 
diff --git a/examples/quickcontrols2/contactlist/contactlist.pro b/examples/quickcontrols2/contactlist/contactlist.pro
index 9025dbde..101db15a 100644
--- a/examples/quickcontrols2/contactlist/contactlist.pro
+++ b/examples/quickcontrols2/contactlist/contactlist.pro
@@ -10,7 +10,13 @@ SOURCES += \
     contactmodel.cpp
 
 RESOURCES += \
-   $$files(*.qml)
+    ContactDelegate.ui.qml \
+    ContactDialog.qml \
+    ContactForm.ui.qml \
+    contactlist.qml \
+    ContactView.ui.qml \
+    designer/Backend/ContactModel.qml \
+    SectionDelegate.ui.qml
 
 # Additional import path used to resolve QML modules just for Qt Quick Designer
 QML_DESIGNER_IMPORT_PATH = $$PWD/designer
diff --git a/examples/quickcontrols2/contactlist/doc/src/qtquickcontrols2-contactlist.qdoc b/examples/quickcontrols2/contactlist/doc/src/qtquickcontrols2-contactlist.qdoc
index 069b6981..110f398f 100644
--- a/examples/quickcontrols2/contactlist/doc/src/qtquickcontrols2-contactlist.qdoc
+++ b/examples/quickcontrols2/contactlist/doc/src/qtquickcontrols2-contactlist.qdoc
@@ -26,6 +26,7 @@
 ****************************************************************************/
 /*!
     \example contactlist
+    \keyword Qt Quick Controls - Contact List
     \title Qt Quick Controls 2 - Contact List
     \ingroup qtquickcontrols2-examples
     \brief A QML app using Qt Quick Controls 2 and a C++ class that implements
diff --git a/examples/quickcontrols2/flatstyle/doc/src/qtquickcontrols2-flatstyle.qdoc b/examples/quickcontrols2/flatstyle/doc/src/qtquickcontrols2-flatstyle.qdoc
index 55c1e8c5..c123b27e 100644
--- a/examples/quickcontrols2/flatstyle/doc/src/qtquickcontrols2-flatstyle.qdoc
+++ b/examples/quickcontrols2/flatstyle/doc/src/qtquickcontrols2-flatstyle.qdoc
@@ -27,6 +27,7 @@
 
 /*!
     \example flatstyle
+    \keyword Qt Quick Controls - Flat Style
     \title Qt Quick Controls 2 - Flat Style
     \ingroup qtquickcontrols2-examples
     \brief A QML app using Qt Quick Controls 2 and a QML plugin
diff --git a/examples/quickcontrols2/flatstyle/flatstyle.pro b/examples/quickcontrols2/flatstyle/flatstyle.pro
index a8ca01bf..fe9e42a8 100644
--- a/examples/quickcontrols2/flatstyle/flatstyle.pro
+++ b/examples/quickcontrols2/flatstyle/flatstyle.pro
@@ -6,10 +6,14 @@ QT += quick quickcontrols2 widgets
 SOURCES += main.cpp
 
 RESOURCES += \
-   qtquickcontrols2.conf \
-   $$files(*.qml) \
-   $$files(imports/Theme/*) \
-   $$files(Flat/*.qml)
+    qtquickcontrols2.conf \
+    flatstyle.qml \
+    MainForm.ui.qml \
+    Flat/Button.qml \
+    Flat/CheckBox.qml \
+    Flat/Switch.qml \
+    imports/Theme/Theme.qml \
+    imports/Theme/qmldir
 
 # Additional import path used to resolve QML modules in Qt Creator's code model
 QML_IMPORT_PATH = $$PWD/imports
diff --git a/examples/quickcontrols2/gallery/doc/src/qtquickcontrols2-gallery.qdoc b/examples/quickcontrols2/gallery/doc/src/qtquickcontrols2-gallery.qdoc
index b96ba282..560acf52 100644
--- a/examples/quickcontrols2/gallery/doc/src/qtquickcontrols2-gallery.qdoc
+++ b/examples/quickcontrols2/gallery/doc/src/qtquickcontrols2-gallery.qdoc
@@ -27,6 +27,7 @@
 
 /*!
     \example gallery
+    \keyword Qt Quick Controls - Gallery
     \title Qt Quick Controls 2 - Gallery
     \ingroup qtquickcontrols2-examples
     \brief A gallery of controls.
diff --git a/examples/quickcontrols2/gallery/gallery.pro b/examples/quickcontrols2/gallery/gallery.pro
index 705eeae0..2b898fca 100644
--- a/examples/quickcontrols2/gallery/gallery.pro
+++ b/examples/quickcontrols2/gallery/gallery.pro
@@ -7,11 +7,59 @@ SOURCES += \
 
 RESOURCES += \
     gallery.qml \
+    pages/BusyIndicatorPage.qml \
+    pages/ButtonPage.qml \
+    pages/CheckBoxPage.qml \
+    pages/ComboBoxPage.qml \
+    pages/DelayButtonPage.qml \
+    pages/DelegatePage.qml \
+    pages/DialogPage.qml \
+    pages/DialPage.qml \
+    pages/FramePage.qml \
+    pages/GroupBoxPage.qml \
+    pages/PageIndicatorPage.qml \
+    pages/ProgressBarPage.qml \
+    pages/RadioButtonPage.qml \
+    pages/RangeSliderPage.qml \
+    pages/ScrollablePage.qml \
+    pages/ScrollBarPage.qml \
+    pages/ScrollIndicatorPage.qml \
+    pages/SliderPage.qml \
+    pages/SpinBoxPage.qml \
+    pages/StackViewPage.qml \
+    pages/SwipeViewPage.qml \
+    pages/SwitchPage.qml \
+    pages/TabBarPage.qml \
+    pages/TextAreaPage.qml \
+    pages/TextFieldPage.qml \
+    pages/ToolTipPage.qml \
+    pages/TumblerPage.qml \
     qtquickcontrols2.conf \
     icons/gallery/index.theme \
-    $$files(icons/*.png, true) \
-    $$files(images/*.png) \
-    $$files(pages/*.qml)
+    icons/gallery/20x20/back.png \
+    icons/gallery/20x20/drawer.png \
+    icons/gallery/20x20/menu.png \
+    icons/gallery/20x20@2/back.png \
+    icons/gallery/20x20@2/drawer.png \
+    icons/gallery/20x20@2/menu.png \
+    icons/gallery/20x20@3/back.png \
+    icons/gallery/20x20@3/drawer.png \
+    icons/gallery/20x20@3/menu.png \
+    icons/gallery/20x20@4/back.png \
+    icons/gallery/20x20@4/drawer.png \
+    icons/gallery/20x20@4/menu.png \
+    images/arrow.png \
+    images/arrow@2x.png \
+    images/arrow@3x.png \
+    images/arrow@4x.png \
+    images/arrows.png \
+    images/arrows@2x.png \
+    images/arrows@3x.png \
+    images/arrows@4x.png \
+    images/qt-logo.png \
+    images/qt-logo@2x.png \
+    images/qt-logo@3x.png \
+    images/qt-logo@4x.png
 
 target.path = $$[QT_INSTALL_EXAMPLES]/quickcontrols2/gallery
 INSTALLS += target
diff --git a/examples/quickcontrols2/imagine/automotive/doc/src/qtquickcontrols2-automotive.qdoc b/examples/quickcontrols2/imagine/automotive/doc/src/qtquickcontrols2-automotive.qdoc
index 9a8c1883..6e293450 100644
--- a/examples/quickcontrols2/imagine/automotive/doc/src/qtquickcontrols2-automotive.qdoc
+++ b/examples/quickcontrols2/imagine/automotive/doc/src/qtquickcontrols2-automotive.qdoc
@@ -27,6 +27,7 @@
 
 /*!
     \example imagine/automotive
+    \keyword Qt Quick Controls - Imagine Style Example: Automotive
     \title Qt Quick Controls 2 - Imagine Style Example: Automotive
     \ingroup qtquickcontrols2-examples
     \brief An automotive user interface using custom Imagine style assets.
diff --git a/examples/quickcontrols2/imagine/musicplayer/doc/src/qtquickcontrols2-musicplayer.qdoc b/examples/quickcontrols2/imagine/musicplayer/doc/src/qtquickcontrols2-musicplayer.qdoc
index 960c683d..f6c2189f 100644
--- a/examples/quickcontrols2/imagine/musicplayer/doc/src/qtquickcontrols2-musicplayer.qdoc
+++ b/examples/quickcontrols2/imagine/musicplayer/doc/src/qtquickcontrols2-musicplayer.qdoc
@@ -27,6 +27,7 @@
 
 /*!
     \example imagine/musicplayer
+    \keyword Qt Quick Controls - Imagine Style Example: Music Player
     \title Qt Quick Controls 2 - Imagine Style Example: Music Player
     \ingroup qtquickcontrols2-examples
     \brief An audio player user interface using custom Imagine style assets.
diff --git a/examples/quickcontrols2/sidepanel/doc/src/qtquickcontrols2-sidepanel.qdoc b/examples/quickcontrols2/sidepanel/doc/src/qtquickcontrols2-sidepanel.qdoc
index bc630bb8..a7d0828e 100644
--- a/examples/quickcontrols2/sidepanel/doc/src/qtquickcontrols2-sidepanel.qdoc
+++ b/examples/quickcontrols2/sidepanel/doc/src/qtquickcontrols2-sidepanel.qdoc
@@ -27,6 +27,7 @@
 
 /*!
     \example sidepanel
+    \keyword Qt Quick Controls - Side Panel
     \title Qt Quick Controls 2 - Side Panel
     \ingroup qtquickcontrols2-examples
     \brief A persistent side panel with Drawer.
diff --git a/examples/quickcontrols2/sidepanel/sidepanel.pro b/examples/quickcontrols2/sidepanel/sidepanel.pro
index e2fc4aff..1fddc70a 100644
--- a/examples/quickcontrols2/sidepanel/sidepanel.pro
+++ b/examples/quickcontrols2/sidepanel/sidepanel.pro
@@ -6,8 +6,13 @@ SOURCES += \
     sidepanel.cpp
 
 RESOURCES += \
-    sidepanel.qml \
-    $$files(images/*.png)
+    doc/images/qtquickcontrols2-sidepanel-landscape.png \
+    doc/images/qtquickcontrols2-sidepanel-portrait.png \
+    images/qt-logo@2x.png \
+    images/qt-logo@3x.png \
+    images/qt-logo@4x.png \
+    images/qt-logo.png \
+    sidepanel.qml
 
 target.path = $$[QT_INSTALL_EXAMPLES]/quickcontrols2/sidepanel
 INSTALLS += target
diff --git a/examples/quickcontrols2/swipetoremove/doc/src/qtquickcontrols2-swipetoremove.qdoc b/examples/quickcontrols2/swipetoremove/doc/src/qtquickcontrols2-swipetoremove.qdoc
index 476667bb..9fd05261 100644
--- a/examples/quickcontrols2/swipetoremove/doc/src/qtquickcontrols2-swipetoremove.qdoc
+++ b/examples/quickcontrols2/swipetoremove/doc/src/qtquickcontrols2-swipetoremove.qdoc
@@ -27,6 +27,7 @@
 
 /*!
     \example swipetoremove
+    \keyword Qt Quick Controls - Swipe to Remove
     \title Qt Quick Controls 2 - Swipe to Remove
     \ingroup qtquickcontrols2-examples
     \brief Demonstrates removal of list items by swipe gesture.
diff --git a/examples/quickcontrols2/texteditor/doc/src/qtquickcontrols2-texteditor.qdoc b/examples/quickcontrols2/texteditor/doc/src/qtquickcontrols2-texteditor.qdoc
index a9406f23..6ba64b34 100644
--- a/examples/quickcontrols2/texteditor/doc/src/qtquickcontrols2-texteditor.qdoc
+++ b/examples/quickcontrols2/texteditor/doc/src/qtquickcontrols2-texteditor.qdoc
@@ -26,6 +26,7 @@
 ****************************************************************************/
 /*!
     \example texteditor
+    \keyword Qt Quick Controls - Text Editor
     \title Qt Quick Controls 2 - Text Editor
     \ingroup qtquickcontrols2-examples
     \brief A QML app using Qt Quick Controls 2 and a C++ class to
diff --git a/examples/quickcontrols2/wearable/doc/src/qtquickcontrols2-wearable.qdoc b/examples/quickcontrols2/wearable/doc/src/qtquickcontrols2-wearable.qdoc
index 124984c1..fae719f8 100644
--- a/examples/quickcontrols2/wearable/doc/src/qtquickcontrols2-wearable.qdoc
+++ b/examples/quickcontrols2/wearable/doc/src/qtquickcontrols2-wearable.qdoc
@@ -27,6 +27,7 @@
 
 /*!
     \example wearable
+    \keyword Qt Quick Controls - Wearable Demo
     \title Qt Quick Controls 2 - Wearable Demo
     \ingroup qtquickcontrols2-examples
     \brief Demonstrates an application launcher designed for wearable devices.
diff --git a/src/imports/calendar/doc/qtlabscalendar.qdocconf b/src/imports/calendar/doc/qtlabscalendar.qdocconf
index 0e230aa1..899dce21 100644
--- a/src/imports/calendar/doc/qtlabscalendar.qdocconf
+++ b/src/imports/calendar/doc/qtlabscalendar.qdocconf
@@ -22,7 +22,10 @@ qhp.QtLabsCalendar.subprojects.qmltypes.indexTitle = Qt Labs Calendar QML Types
 qhp.QtLabsCalendar.subprojects.qmltypes.selectors = qmlclass
 qhp.QtLabsCalendar.subprojects.qmltypes.sortPages = true
 
-depends = qtcore qtgui qtdoc qtqml qtquick qtquickcontrols2
+depends = qtcore qtgui qtdoc qtqml qtquick qtquickcontrols
+
+# This module has no documented C++ types, clear the module header
+moduleheader =
 
 headerdirs += ../
 sourcedirs += ../ src
diff --git a/src/imports/controls/designer/SliderSpecifics.qml b/src/imports/controls/designer/SliderSpecifics.qml
index 69bc2574..08a3f868 100644
--- a/src/imports/controls/designer/SliderSpecifics.qml
+++ b/src/imports/controls/designer/SliderSpecifics.qml
@@ -112,7 +112,7 @@ Column {
             }
             SecondColumnLayout {
                 ComboBox {
-                    backendValue: backendValues.orientation
+                    backendValue: backendValues.snapMode
                     model: [ "NoSnap", "SnapOnRelease", "SnapAlways" ]
                     scope: "Slider"
                     Layout.fillWidth: true
diff --git a/src/imports/controls/doc/doc.pri b/src/imports/controls/doc/doc.pri
index 8eaccbed..f1bf7e80 100644
--- a/src/imports/controls/doc/doc.pri
+++ b/src/imports/controls/doc/doc.pri
@@ -1,4 +1,4 @@
-QMAKE_DOCS = $$PWD/qtquickcontrols2.qdocconf
+QMAKE_DOCS = $$PWD/qtquickcontrols.qdocconf
 
 OTHER_FILES += \
     $$files($$PWD/snippets/*.qml) \
diff --git a/src/imports/controls/doc/qtquickcontrols2.qdocconf b/src/imports/controls/doc/qtquickcontrols.qdocconf
index eae5a387..b308b2da 100644
--- a/src/imports/controls/doc/qtquickcontrols2.qdocconf
+++ b/src/imports/controls/doc/qtquickcontrols.qdocconf
@@ -1,36 +1,36 @@
 include($QT_INSTALL_DOCS/global/qt-module-defaults.qdocconf)
 include(manifest-meta.qdocconf)
 
-project                 = QtQuickControls2
-description             = Qt Quick Controls 2 Reference Documentation
+project                 = QtQuickControls
+description             = Qt Quick Controls Reference Documentation
 version                 = $QT_VERSION
 
-qhp.projects            = QtQuickControls2
-
-qhp.QtQuickControls2.file          = qtquickcontrols2.qhp
-qhp.QtQuickControls2.namespace     = org.qt-project.qtquickcontrols2.$QT_VERSION_TAG
-qhp.QtQuickControls2.virtualFolder = qtquickcontrols2
-qhp.QtQuickControls2.indexTitle    = Qt Quick Controls 2
-qhp.QtQuickControls2.indexRoot     =
-
-qhp.QtQuickControls2.filterAttributes                  = qtquickcontrols2 $QT_VERSION qtrefdoc
-qhp.QtQuickControls2.customFilters.Qt.name             = QtQuickControls2 $QT_VERSION
-qhp.QtQuickControls2.customFilters.Qt.filterAttributes = qtquickcontrols2 $QT_VERSION
-
-qhp.QtQuickControls2.subprojects = qmltypes classes examples
-qhp.QtQuickControls2.subprojects.qmltypes.title = QML Types
-qhp.QtQuickControls2.subprojects.qmltypes.indexTitle = Qt Quick Controls 2 QML Types
-qhp.QtQuickControls2.subprojects.qmltypes.selectors = qmlclass
-qhp.QtQuickControls2.subprojects.qmltypes.sortPages = true
-qhp.QtQuickControls2.subprojects.classes.title = C++ Classes
-qhp.QtQuickControls2.subprojects.classes.indexTitle = Qt Quick Controls 2 C++ Classes
-qhp.QtQuickControls2.subprojects.classes.selectors = class fake:headerfile
-qhp.QtQuickControls2.subprojects.classes.sortPages = true
-qhp.QtQuickControls2.subprojects.examples.title = Examples
-qhp.QtQuickControls2.subprojects.examples.indexTitle = Qt Quick Controls 2 Examples
-qhp.QtQuickControls2.subprojects.examples.selectors = fake:example
-
-depends = qtcore qtgui qtdoc qtqml qtquick qtquickdialogs qtquickcontrols qtquickextras qmake qtsql qtwidgets qtlabscalendar qtlabsplatform
+qhp.projects            = QtQuickControls
+
+qhp.QtQuickControls.file          = qtquickcontrols.qhp
+qhp.QtQuickControls.namespace     = org.qt-project.qtquickcontrols.$QT_VERSION_TAG
+qhp.QtQuickControls.virtualFolder = qtquickcontrols
+qhp.QtQuickControls.indexTitle    = Qt Quick Controls
+qhp.QtQuickControls.indexRoot     =
+
+qhp.QtQuickControls.filterAttributes                  = qtquickcontrols $QT_VERSION qtrefdoc
+qhp.QtQuickControls.customFilters.Qt.name             = QtQuickControls $QT_VERSION
+qhp.QtQuickControls.customFilters.Qt.filterAttributes = qtquickcontrols $QT_VERSION
+
+qhp.QtQuickControls.subprojects = qmltypes classes examples
+qhp.QtQuickControls.subprojects.qmltypes.title = QML Types
+qhp.QtQuickControls.subprojects.qmltypes.indexTitle = Qt Quick Controls QML Types
+qhp.QtQuickControls.subprojects.qmltypes.selectors = qmlclass
+qhp.QtQuickControls.subprojects.qmltypes.sortPages = true
+qhp.QtQuickControls.subprojects.classes.title = C++ Classes
+qhp.QtQuickControls.subprojects.classes.indexTitle = Qt Quick Controls C++ Classes
+qhp.QtQuickControls.subprojects.classes.selectors = class fake:headerfile
+qhp.QtQuickControls.subprojects.classes.sortPages = true
+qhp.QtQuickControls.subprojects.examples.title = Examples
+qhp.QtQuickControls.subprojects.examples.indexTitle = Qt Quick Controls Examples
+qhp.QtQuickControls.subprojects.examples.selectors = fake:example
+
+depends = qtcore qtgui qtdoc qtqml qtquick qtquickdialogs qtquickcontrols1 qtquickextras qmake qtsql qtwidgets qtlabscalendar qtlabsplatform
 
 # Specify the install path under QT_INSTALL_EXAMPLES
 # Note: paths passed to \example command must contain the parent directory, e.g.
@@ -41,7 +41,7 @@ exampledirs += ../../../../examples/quickcontrols2 \
 
 examples.fileextensions += "*.conf"
 
-examplesinstallpath = quickcontrols2
+examplesinstallpath = quickcontrols
 
 headerdirs += ../../../quicktemplates2 \
               ../../../quickcontrols2
@@ -58,11 +58,11 @@ sources.fileextensions = "*.c++ *.cc *.cpp *.cxx *.mm *.qdoc"
 imagedirs += images \
              ..
 
-navigation.landingpage  = "Qt Quick Controls 2"
-navigation.qmltypespage = "Qt Quick Controls 2 QML Types"
-navigation.cppclassespage = "Qt Quick Controls 2 C++ Classes"
+navigation.landingpage  = "Qt Quick Controls"
+navigation.qmltypespage = "Qt Quick Controls QML Types"
+navigation.cppclassespage = "Qt Quick Controls C++ Classes"
 
-tagfile                 = qtquickcontrols2.tags
+tagfile                 = qtquickcontrols.tags
 
 # \styleimport {QtQuick.Controls.Universal 2.0}
 macro.styleimport.HTML = "<table class=\"alignedsummary\"><tbody><tr><td class=\"memItemLeft rightAlign topAlign\"> Import Statement:</td><td class=\"memItemRight bottomAlign\"> import \1</td></tr><tr><td class=\"memItemLeft rightAlign topAlign\"> Since:</td><td class=\"memItemRight bottomAlign\"> \2</td></tr></tbody></table>"
diff --git a/src/imports/controls/doc/src/qtquickcontrols2-configuration.qdoc b/src/imports/controls/doc/src/qtquickcontrols2-configuration.qdoc
index cab3b6fe..a907f532 100644
--- a/src/imports/controls/doc/src/qtquickcontrols2-configuration.qdoc
+++ b/src/imports/controls/doc/src/qtquickcontrols2-configuration.qdoc
@@ -27,6 +27,7 @@
 
 /*!
     \page qtquickcontrols2-configuration.html
+    \keyword Qt Quick Controls Configuration File
     \title Qt Quick Controls 2 Configuration File
 
     Qt Quick Controls 2 support a special configuration file, \c :/qtquickcontrols2.conf,
diff --git a/src/imports/controls/doc/src/qtquickcontrols2-cppclasses.qdoc b/src/imports/controls/doc/src/qtquickcontrols2-cppclasses.qdoc
index d548bbfb..a2a77505 100644
--- a/src/imports/controls/doc/src/qtquickcontrols2-cppclasses.qdoc
+++ b/src/imports/controls/doc/src/qtquickcontrols2-cppclasses.qdoc
@@ -27,6 +27,7 @@
 
 /*!
     \module QtQuickControls2
+    \keyword Qt Quick Controls C++ Classes
     \title Qt Quick Controls 2 C++ Classes
     \ingroup modules
     \brief Provides classes for setting up the controls from C++.
diff --git a/src/imports/controls/doc/src/qtquickcontrols2-differences.qdoc b/src/imports/controls/doc/src/qtquickcontrols2-differences.qdoc
index c4416e14..6e5c7981 100644
--- a/src/imports/controls/doc/src/qtquickcontrols2-differences.qdoc
+++ b/src/imports/controls/doc/src/qtquickcontrols2-differences.qdoc
@@ -146,7 +146,7 @@
 
     For example, to style a button in Qt Quick Controls:
 
-    \badcode
+    \qml
     Button {
         style: ButtonStyle {
             label: Label {
@@ -154,7 +154,7 @@
             }
         }
     }
-    \endcode
+    \endqml
 
     To style a button in Qt Quick Controls 2:
 
@@ -174,21 +174,21 @@
     moved to a file named \c Button.qml in a directory named \c controls, and
     used in the following manner:
 
-    \badcode
+    \qml
     import "controls" as Controls
 
     Controls.Button {
-        ...
+        // ...
     }
-    \endcode
+    \endqml
 
     This works with both modules, and will reduce the amount of work needed
     when the migration begins.
 
     \section2 Type Comparison Table
 
-    The first column lists all types available in \l {Qt Quick Controls}
-    {Qt Quick Controls 1}, \l {Qt Quick Dialogs}, and \l {Qt Quick Extras}.
+    The first column lists all types available in \l {Qt Quick Controls 1},
+    \l {Qt Quick Dialogs}, and \l {Qt Quick Extras}.
     The second column documents the respective type in Qt Quick Controls 2.
     When a direct alternative is not available, the third column contains
     an alternative that provides related functionality. The last column
@@ -202,27 +202,27 @@
         \li Alternatives
         \li Remarks
     \row
-        \li \l [QML QtQuickControls] {Action}
+        \li \l [QML QtQuickControls1] {Action}
         \li \l [QML QtQuickControls2] {Action}
         \li \l [QML QtQuick] {Shortcut} \br\sup {(Qt Quick)}
         \li
     \row
-        \li \l [QML QtQuickControls] {ApplicationWindow}
+        \li \l [QML QtQuickControls1] {ApplicationWindow}
         \li \l [QML QtQuickControls2] {ApplicationWindow}
         \li
         \li
     \row
-        \li \l [QML QtQuickControls] {BusyIndicator}
+        \li \l [QML QtQuickControls1] {BusyIndicator}
         \li \l [QML QtQuickControls2] {BusyIndicator}
         \li
         \li
     \row
-        \li \l [QML QtQuickControls] {Button}
+        \li \l [QML QtQuickControls1] {Button}
         \li \l [QML QtQuickControls2] {Button}
         \li
         \li
     \row
-        \li \l [QML QtQuickControls] {Calendar}
+        \li \l [QML QtQuickControls1] {Calendar}
         \li \mdash
         \li \l [QML QtLabsCalendar] {MonthGrid},\br
             \l [QML QtLabsCalendar] {DayOfWeekRow},\br
@@ -232,17 +232,17 @@
                     are \e experimental unstyled building blocks for calendar views.
             \endlist
     \row
-        \li \l [QML QtQuickControls] {CheckBox}
+        \li \l [QML QtQuickControls1] {CheckBox}
         \li \l [QML QtQuickControls2] {CheckBox}
         \li
         \li
     \row
-        \li \l [QML QtQuickControls] {ComboBox}
+        \li \l [QML QtQuickControls1] {ComboBox}
         \li \l [QML QtQuickControls2] {ComboBox}
         \li
         \li
     \row
-        \li \l [QML QtQuickControls] {ExclusiveGroup}
+        \li \l [QML QtQuickControls1] {ExclusiveGroup}
         \li \mdash
         \li \l [QML QtQuickControls2] {ActionGroup},\br
             \l [QML QtQuickControls2] {ButtonGroup} \br\sup {(Qt Quick Controls 2)}
@@ -250,17 +250,17 @@
                 \li \b {Qt Quick Controls 2}: \c ActionGroup and \c ButtonGroup offer similar functionality.
             \endlist
     \row
-        \li \l [QML QtQuickControls] {GroupBox}
+        \li \l [QML QtQuickControls1] {GroupBox}
         \li \l [QML QtQuickControls2] {GroupBox}
         \li
         \li
     \row
-        \li \l [QML QtQuickControls] {Label}
+        \li \l [QML QtQuickControls1] {Label}
         \li \l [QML QtQuickControls2] {Label}
         \li
         \li
     \row
-        \li \l [QML QtQuickControls] {Menu}
+        \li \l [QML QtQuickControls1] {Menu}
         \li \l [QML QtQuickControls2] {Menu}
         \li \l [QML QtLabsPlatform] {Menu} \br\sup {(Qt Labs Platform)}
         \li \list
@@ -281,7 +281,7 @@
                     is not available in the Qt Platform Abstraction Layer.
             \endlist
     \row
-        \li \l [QML QtQuickControls] {MenuBar}
+        \li \l [QML QtQuickControls1] {MenuBar}
         \li \l [QML QtQuickControls2] {MenuBar}
         \li \l [QML QtLabsPlatform] {MenuBar} \br\sup {(Qt Labs Platform)}
         \li \list
@@ -295,8 +295,8 @@
                     in the Qt Platform Abstraction Layer.
             \endlist
     \row
-        \li \l [QML QtQuickControls] {MenuItem},\br
-            \l [QML QtQuickControls] {MenuSeparator}
+        \li \l [QML QtQuickControls1] {MenuItem},\br
+            \l [QML QtQuickControls1] {MenuSeparator}
         \li \l [QML QtQuickControls2] {MenuItem},\br
             \l [QML QtQuickControls2] {MenuSeparator}
         \li \l [QML QtLabsPlatform] {MenuItem},\br
@@ -312,39 +312,39 @@
                     native menu items and separators.
             \endlist
     \row
-        \li \l [QML QtQuickControls] {ProgressBar}
+        \li \l [QML QtQuickControls1] {ProgressBar}
         \li \l [QML QtQuickControls2] {ProgressBar}
         \li
         \li
     \row
-        \li \l [QML QtQuickControls] {RadioButton}
+        \li \l [QML QtQuickControls1] {RadioButton}
         \li \l [QML QtQuickControls2] {RadioButton}
         \li
         \li
     \row
-        \li \l [QML QtQuickControls] {ScrollView}
+        \li \l [QML QtQuickControls1] {ScrollView}
         \li \l [QML QtQuickControls2] {ScrollView}
         \li
         \li
     \row
-        \li \l [QML QtQuickControls] {Slider}
+        \li \l [QML QtQuickControls1] {Slider}
         \li \l [QML QtQuickControls2] {Slider}
         \li
         \li
     \row
-        \li \l [QML QtQuickControls] {SpinBox}
+        \li \l [QML QtQuickControls1] {SpinBox}
         \li \l [QML QtQuickControls2] {SpinBox}
         \li
         \li
     \row
-        \li \l [QML QtQuickControls] {SplitView}
+        \li \l [QML QtQuickControls1] {SplitView}
         \li \mdash
         \li
         \li
     \row
-        \li \l [QML QtQuickControls] {StackView},\br
-            \l [QML QtQuickControls] {StackViewDelegate},\br
-            \l [QML QtQuickControls] {Stack}
+        \li \l [QML QtQuickControls1] {StackView},\br
+            \l [QML QtQuickControls1] {StackViewDelegate},\br
+            \l [QML QtQuickControls1] {Stack}
         \li \l [QML QtQuickControls2] {StackView}
         \li
         \li \list
@@ -352,7 +352,7 @@
                     and attached properties via a single \c StackView type.
             \endlist
     \row
-        \li \l [QML QtQuickControls] {StatusBar}
+        \li \l [QML QtQuickControls1] {StatusBar}
         \li \mdash
         \li \l [QML QtQuickControls2] {ToolBar} \br\sup {(Qt Quick Controls 2)}
         \li \list
@@ -360,13 +360,13 @@
                     item or control, such as \c ToolBar, as a header or footer.
             \endlist
     \row
-        \li \l [QML QtQuickControls] {Switch}
+        \li \l [QML QtQuickControls1] {Switch}
         \li \l [QML QtQuickControls2] {Switch}
         \li
         \li
     \row
-        \li \l [QML QtQuickControls] {TabView},\br
-            \l [QML QtQuickControls] {Tab}
+        \li \l [QML QtQuickControls1] {TabView},\br
+            \l [QML QtQuickControls1] {Tab}
         \li \mdash
         \li \l [QML QtQuickControls2] {TabBar},\br
             \l [QML QtQuickControls2] {TabButton} \br\sup {(Qt Quick Controls 2)}
@@ -375,12 +375,12 @@
                     functionality, and can be used to build tabbed views.
             \endlist
     \row
-        \li \l [QML QtQuickControls] {TableView}
+        \li \l [QML QtQuickControls1] {TableView}
         \li \mdash
         \li
         \li
     \row
-        \li \l [QML QtQuickControls] {TextArea}
+        \li \l [QML QtQuickControls1] {TextArea}
         \li \l [QML QtQuickControls2] {TextArea}
         \li
         \li \list
@@ -392,22 +392,22 @@
                     scrollable areas, which can be problematic and cause usability issues.
             \endlist
     \row
-        \li \l [QML QtQuickControls] {TextField}
+        \li \l [QML QtQuickControls1] {TextField}
         \li \l [QML QtQuickControls2] {TextField}
         \li
         \li
     \row
-        \li \l [QML QtQuickControls] {ToolBar}
+        \li \l [QML QtQuickControls1] {ToolBar}
         \li \l [QML QtQuickControls2] {ToolBar}
         \li
         \li
     \row
-        \li \l [QML QtQuickControls] {ToolButton}
+        \li \l [QML QtQuickControls1] {ToolButton}
         \li \l [QML QtQuickControls2] {ToolButton}
         \li
         \li
     \row
-        \li \l [QML QtQuickControls] {TreeView}
+        \li \l [QML QtQuickControls1] {TreeView}
         \li \mdash
         \li
         \li
@@ -519,14 +519,14 @@
     \row
         \li \mdash
         \li \l [QML QtQuickControls2] {ActionGroup}
-        \li \l [QML QtQuickControls] {ExclusiveGroup} \br\sup {(Qt Quick Controls 1)}
+        \li \l [QML QtQuickControls1] {ExclusiveGroup} \br\sup {(Qt Quick Controls 1)}
         \li \list
                 \li \b {Qt Quick Controls 1}: \c ExclusiveGroup offers similar functionality.
             \endlist
     \row
         \li \mdash
         \li \l [QML QtQuickControls2] {ButtonGroup}
-        \li \l [QML QtQuickControls] {ExclusiveGroup} \br\sup {(Qt Quick Controls 1)}
+        \li \l [QML QtQuickControls1] {ExclusiveGroup} \br\sup {(Qt Quick Controls 1)}
         \li \list
                 \li \b {Qt Quick Controls 1}: \c ExclusiveGroup offers similar functionality.
             \endlist
@@ -599,7 +599,7 @@
         \li \mdash
         \li \l [QML QtQuickControls2] {ScrollBar},\br
             \l [QML QtQuickControls2] {ScrollIndicator}
-        \li \l [QML QtQuickControls] {ScrollView} \br\sup {(Qt Quick Controls 1)}
+        \li \l [QML QtQuickControls1] {ScrollView} \br\sup {(Qt Quick Controls 1)}
         \li \list
                 \li \b {Qt Quick Controls 1}: \c ScrollView offers similar functionality.
                     It combines horizontal and vertical scrollbars, and the background and
@@ -644,7 +644,7 @@
         \li \mdash
         \li \l [QML QtQuickControls2] {TabBar},\br
             \l [QML QtQuickControls2] {TabButton}
-        \li \l [QML QtQuickControls] {TabView} \br\sup {(Qt Quick Controls 1)}
+        \li \l [QML QtQuickControls1] {TabView} \br\sup {(Qt Quick Controls 1)}
         \li \list
                 \li \b {Qt Quick Controls 1}: \c TabView offers similar functionality.
                     It combines the tab bar, background and frame around the tabs.
@@ -670,7 +670,7 @@
     \list
       \li \l{Qt Quick}
       \li \l{Qt Quick Controls 2 QML Types}
-      \li \l{Qt Quick Controls QML Types}
+      \li \l{Qt Quick Controls 1 QML Types}
       \li \l{Qt Quick Extras QML Types}
       \li \l{Qt Labs Calendar QML Types}
       \li \l{Qt Labs Platform QML Types}
diff --git a/src/imports/controls/doc/src/qtquickcontrols2-examples.qdoc b/src/imports/controls/doc/src/qtquickcontrols2-examples.qdoc
index 0218c57a..e10037df 100644
--- a/src/imports/controls/doc/src/qtquickcontrols2-examples.qdoc
+++ b/src/imports/controls/doc/src/qtquickcontrols2-examples.qdoc
@@ -28,6 +28,7 @@
 /*!
     \group qtquickcontrols2-examples
     \ingroup all-examples
+    \keyword Qt Quick Controls Examples
     \title Qt Quick Controls 2 Examples
     \brief A collection of examples for \l {Qt Quick Controls 2}
 
diff --git a/src/imports/controls/doc/src/qtquickcontrols2-guidelines.qdoc b/src/imports/controls/doc/src/qtquickcontrols2-guidelines.qdoc
index b5df0248..24a5be62 100644
--- a/src/imports/controls/doc/src/qtquickcontrols2-guidelines.qdoc
+++ b/src/imports/controls/doc/src/qtquickcontrols2-guidelines.qdoc
@@ -27,6 +27,7 @@
 
 /*!
     \page qtquickcontrols2-guidelines.html
+    \keyword Qt Quick Controls Guidelines
     \title Qt Quick Controls 2 Guidelines
 
     Qt Quick Controls 2 offers a selection of controls that can be used to
diff --git a/src/imports/controls/doc/src/qtquickcontrols2-index.qdoc b/src/imports/controls/doc/src/qtquickcontrols2-index.qdoc
index 8e3a12e7..a9916f60 100644
--- a/src/imports/controls/doc/src/qtquickcontrols2-index.qdoc
+++ b/src/imports/controls/doc/src/qtquickcontrols2-index.qdoc
@@ -26,7 +26,8 @@
 ****************************************************************************/
 
 /*!
-    \page qtquickcontrols2-index.html
+    \page qtquickcontrols-index.html
+    \keyword Qt Quick Controls
     \title Qt Quick Controls 2
 
     \brief Provides a set of UI controls for Qt Quick.
diff --git a/src/imports/controls/doc/src/qtquickcontrols2-qmltypes.qdoc b/src/imports/controls/doc/src/qtquickcontrols2-qmltypes.qdoc
index 6ebe2fe9..5f0f704c 100644
--- a/src/imports/controls/doc/src/qtquickcontrols2-qmltypes.qdoc
+++ b/src/imports/controls/doc/src/qtquickcontrols2-qmltypes.qdoc
@@ -27,6 +27,7 @@
 
 /*!
     \qmlmodule QtQuick.Controls 2.5
+    \keyword Qt Quick Controls QML Types
     \title Qt Quick Controls 2 QML Types
     \ingroup qmlmodules
     \brief Provides QML types for user interfaces (Qt Quick Controls 2).
diff --git a/src/imports/controls/material/qt_attribution.json b/src/imports/controls/material/qt_attribution.json
index 01b45e9f..85fdadf9 100644
--- a/src/imports/controls/material/qt_attribution.json
+++ b/src/imports/controls/material/qt_attribution.json
@@ -1,7 +1,7 @@
 {
     "Id": "shadow_angular_material",
     "Name": "Shadow values from Angular Material",
-    "QDocModule": "qtquickcontrols2",
+    "QDocModule": "qtquickcontrols",
     "QtUsage": "Used in the Material Style of Qt Quick Controls 2.",
     "Files": "ElevationEffect.qml",
     "Description": "Shadow values for the elevation effect.",
diff --git a/src/imports/platform/doc/qtlabsplatform.qdocconf b/src/imports/platform/doc/qtlabsplatform.qdocconf
index e78a9644..c4a217ab 100644
--- a/src/imports/platform/doc/qtlabsplatform.qdocconf
+++ b/src/imports/platform/doc/qtlabsplatform.qdocconf
@@ -22,7 +22,10 @@ qhp.QtLabsPlatform.subprojects.qmltypes.indexTitle = Qt Labs Platform QML Types
 qhp.QtLabsPlatform.subprojects.qmltypes.selectors = qmlclass
 qhp.QtLabsPlatform.subprojects.qmltypes.sortPages = true
 
-depends = qtcore qtgui qtdoc qtqml qtquick qtquickcontrols2 qtwidgets
+depends = qtcore qtgui qtdoc qtqml qtquick qtquickcontrols qtwidgets
+
+# This module has no documented C++ types, clear the module header
+moduleheader =
 
 headerdirs += ../
 sourcedirs += ../
diff --git a/tests/auto/font/tst_font.cpp b/tests/auto/font/tst_font.cpp
index cd41be91..b9371c12 100644
--- a/tests/auto/font/tst_font.cpp
+++ b/tests/auto/font/tst_font.cpp
@@ -133,6 +133,11 @@ void tst_font::font()
     QFETCH(QString, testFile);
     QFETCH(QFont, expectedFont);
 
+    if (QSysInfo::productType().compare(QLatin1String("osx"), Qt::CaseInsensitive) == 0
+            && qgetenv("QTEST_ENVIRONMENT").split(' ').contains("CI")) {
+        QSKIP("This test crashes on macOS: QTBUG-70063");
+    }
+
     QQmlEngine engine;
     QQmlComponent component(&engine);
     component.loadUrl(testFileUrl(testFile));
diff --git a/tests/auto/qquickapplicationwindow/tst_qquickapplicationwindow.cpp b/tests/auto/qquickapplicationwindow/tst_qquickapplicationwindow.cpp
index dec32e36..80124230 100644
--- a/tests/auto/qquickapplicationwindow/tst_qquickapplicationwindow.cpp
+++ b/tests/auto/qquickapplicationwindow/tst_qquickapplicationwindow.cpp
@@ -492,11 +492,6 @@ void tst_QQuickApplicationWindow::attachedProperties()
     QVERIFY(!childItem->property("attached_footer").value<QQuickItem *>());
     QVERIFY(!childItem->property("attached_overlay").value<QQuickItem *>());
     childWindow->close();
-
-    // ### A temporary workaround to unblock the CI until the crash caused
-    // by https://codereview.qt-project.org/#/c/108517/ has been fixed...
-    window->hide();
-    qApp->processEvents();
 }
 
 void tst_QQuickApplicationWindow::font()
diff --git a/tests/auto/shared/qtest_quickcontrols.h b/tests/auto/shared/qtest_quickcontrols.h
index 1c803ae2..4a06c021 100644
--- a/tests/auto/shared/qtest_quickcontrols.h
+++ b/tests/auto/shared/qtest_quickcontrols.h
@@ -55,11 +55,15 @@ static int runTests(QObject *testObject, int argc, char *argv[])
     int res = 0;
     QTest::qInit(testObject, argc, argv);
     const QByteArray testObjectName = QTestResult::currentTestObjectName();
+    // setCurrentTestObject() takes a C string, which means we must ensure
+    // that the string we pass in lives long enough (i.e until the next call
+    // to setCurrentTestObject()), so store the name outside of the loop.
+    QByteArray testName;
     const QStringList styles = testStyles();
     for (const QString &style : styles) {
         qmlClearTypeRegistrations();
         QQuickStyle::setStyle(style);
-        const QByteArray testName = testObjectName + "::" + style.toLocal8Bit();
+        testName = testObjectName + "::" + style.toLocal8Bit();
         QTestResult::setCurrentTestObject(testName);
         res += QTest::qRun();
     }