Merge remote-tracking branch 'origin/5.9' into 5.10

Conflicts:
	src/imports/controls/BusyIndicator.qml
	src/imports/controls/CheckBox.qml
	src/imports/controls/CheckDelegate.qml
	src/imports/controls/ComboBox.qml
	src/imports/controls/DelayButton.qml
	src/imports/controls/Dial.qml
	src/imports/controls/ItemDelegate.qml
	src/imports/controls/MenuItem.qml
	src/imports/controls/RadioButton.qml
	src/imports/controls/RadioDelegate.qml
	src/imports/controls/SwipeDelegate.qml
	src/imports/controls/Switch.qml
	src/imports/controls/SwitchDelegate.qml
	src/imports/controls/doc/src/qtquickcontrols2-configuration.qdoc
	src/imports/controls/material/CheckDelegate.qml
	src/imports/controls/material/ItemDelegate.qml
	src/imports/controls/material/MenuItem.qml
	src/imports/controls/material/RadioDelegate.qml
	src/imports/controls/material/SwipeDelegate.qml
	src/imports/controls/material/SwitchDelegate.qml
	src/imports/controls/qquickdefaultbusyindicator.cpp
	src/imports/controls/qquickdefaultbusyindicator_p.h
	src/imports/controls/qtquickcontrols2plugin.cpp
	src/imports/controls/universal/CheckDelegate.qml
	src/imports/controls/universal/ItemDelegate.qml
	src/imports/controls/universal/MenuItem.qml
	src/imports/controls/universal/RadioDelegate.qml
	src/imports/controls/universal/SwipeDelegate.qml
	src/imports/controls/universal/SwitchDelegate.qml
	src/quickcontrols2/quickcontrols2.pri
	src/quicktemplates2/qquickcontrol.cpp
	src/quicktemplates2/qquickmenu.cpp
	src/quicktemplates2/qquickpopup_p.h

Change-Id: Ib25c8b4a7fe018b7c0ade9b02bfaaa6980118c15

1 files changed, 24 insertions, 3 deletions

diff --git a/src/imports/controls/doc/src/qtquickcontrols2-configuration.qdoc b/src/imports/controls/doc/src/qtquickcontrols2-configuration.qdoc
index 33cfcdc8..9d356686 100644
--- a/src/imports/controls/doc/src/qtquickcontrols2-configuration.qdoc
+++ b/src/imports/controls/doc/src/qtquickcontrols2-configuration.qdoc
@@ -53,21 +53,42 @@
     Primary=BlueGrey
     \endcode
 
-    \section1 Imagine Style Configuration
+    \section1 Controls Section
+
+    The following values can be specified in a \c Controls section of the
+    configuration file:
+
+    \table
+        \header
+            \li Variable
+            \li Description
+        \row
+            \li \c Style
+            \li Specifies the style to run the application with.
+                The value can be the name of one of the \l {Available Styles}{built-in styles}
+                or a \l {Creating a Custom Style}{custom style}.
+        \row
+            \li \c FallbackStyle
+            \li Specifies the style to use for controls that are not implemented.
+                The style must be one of the \l {Available Styles}{built-in styles}.
+                By default, the \l {Default Style}{Default} style is used.
+    \endtable
+
+    \section1 Imagine Section
 
     The following table lists values that can be used to configure the
     \l {Imagine style} in an \c Imagine section of the configuration file:
 
     \include qquickimaginestyle.qdocinc conf
 
-    \section1 Material Style Configuration
+    \section1 Material Section
 
     The following table lists values that can be used to configure the
     \l {Material style} in a \c Material section of the configuration file:
 
     \include qquickmaterialstyle.qdocinc conf
 
-    \section1 Universal Style Configuration
+    \section1 Universal Section
 
     The following table lists values that can be used to configure the
     \l {Universal style} in a \c Universal section of the configuration file: