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

Change-Id: Ia4c5ae4b49beb24b7abb0502990b79bd54ca74ec

7 files changed, 33 insertions, 8 deletions

diff --git a/src/imports/controls/doc/src/qtquickcontrols2-differences.qdoc b/src/imports/controls/doc/src/qtquickcontrols2-differences.qdoc
index 0b09edf6..e30285de 100644
--- a/src/imports/controls/doc/src/qtquickcontrols2-differences.qdoc
+++ b/src/imports/controls/doc/src/qtquickcontrols2-differences.qdoc
@@ -27,7 +27,7 @@
 
 /*!
     \page qtquickcontrols2-differences.html
-    \title Differences between Qt Quick Controls 1
+    \title Differences with Qt Quick Controls 1
 
     Qt Quick Controls 1 was originally developed to support desktop platforms,
     with mobile and embedded support coming shortly afterwards. They have a
diff --git a/src/imports/controls/doc/src/qtquickcontrols2-imagine.qdoc b/src/imports/controls/doc/src/qtquickcontrols2-imagine.qdoc
index c7ad71cf..2a9f1c5d 100644
--- a/src/imports/controls/doc/src/qtquickcontrols2-imagine.qdoc
+++ b/src/imports/controls/doc/src/qtquickcontrols2-imagine.qdoc
@@ -2417,10 +2417,10 @@
     The \l {https://developers.google.com/speed/webp/}{WebP} and GIF animated
     image formats are supported by the Imagine style.
 
-    \section2 Palette
-
     \section2 Customization
 
+    \section3 Path
+
     The Imagine style allows customizing the \l {imagine-path-attached-prop}{path}
     that is used to do the image asset selection. The path can be specified for any
     window or item, and it automatically propagates to children in the same manner as
@@ -2454,23 +2454,40 @@
     \endtable
 
     In addition to specifying the path in QML, it is also possible to specify
-    it via an environment variable or in a configuration file. Attributes
-    specified in QML take precedence over all other methods.
+    it via an \l {imagine-customization-environment-variable}{environment variable}
+    or in a \l {imagine-customization-configuration-file}{configuration file}.
+    Attributes specified in QML take precedence over all other methods.
 
-    \section3 Configuration File
+    \section4 Configuration File
+    \target imagine-customization-configuration-file
 
     \include qquickimaginestyle.qdocinc conf
 
     See \l {Qt Quick Controls 2 Configuration File} for more details about the
     configuration file.
 
-    \section3 Environment Variables
+    \section4 Environment Variables
+    \target imagine-customization-environment-variable
 
     \include qquickimaginestyle.qdocinc env
 
     See \l {Supported Environment Variables in Qt Quick Controls 2} for the full
     list of supported environment variables.
 
+    \section3 Palette
+
+    The Imagine style supports palette customization via the \l {Control::}{palette}
+    property and the \l {Palette Configuration}{qtquickcontrols2.conf} file.
+    As with other styles, the exact \l {palette QML Basic Type}{palette roles}
+    that the Imagine style uses are style-dependent. However, as most of the visual
+    appearance of controls (for example: backgrounds) are managed through image assets,
+    only the roles that are typically used for text will have an effect.
+
+    \section3 Font
+
+    Custom fonts can be set via the \l {Control::}{font} property and the
+    \l {Font Configuration}{configuration} file.
+
     \section2 Dependency
 
     The Imagine style must be separately imported to gain access to the
diff --git a/src/imports/controls/doc/src/qtquickcontrols2-index.qdoc b/src/imports/controls/doc/src/qtquickcontrols2-index.qdoc
index f95db512..d425f421 100644
--- a/src/imports/controls/doc/src/qtquickcontrols2-index.qdoc
+++ b/src/imports/controls/doc/src/qtquickcontrols2-index.qdoc
@@ -154,7 +154,7 @@
       \li \l{Deploying Qt Quick Controls 2 Applications}{Deployment}
       \li \l{Qt Quick Controls 2 Configuration File}{Configuration File}
       \li \l{Supported Environment Variables in Qt Quick Controls 2}{Environment Variables}
-      \li \l{Differences between Qt Quick Controls 1}
+      \li \l{Differences with Qt Quick Controls 1}
     \endlist
 
     \section1 Reference
diff --git a/src/imports/controls/fusion/fusion.pro b/src/imports/controls/fusion/fusion.pro
index 4bc9fcc1..f2de422f 100644
--- a/src/imports/controls/fusion/fusion.pro
+++ b/src/imports/controls/fusion/fusion.pro
@@ -1,5 +1,7 @@
 TARGET = qtquickcontrols2fusionstyleplugin
 TARGETPATH = QtQuick/Controls.2/Fusion
+
+IMPORT_NAME = QtQuick.Controls.Fusion
 IMPORT_VERSION = 2.5
 
 QT += qml quick
diff --git a/src/imports/controls/imagine/imagine.pro b/src/imports/controls/imagine/imagine.pro
index 2368c0a4..c1f2aa8c 100644
--- a/src/imports/controls/imagine/imagine.pro
+++ b/src/imports/controls/imagine/imagine.pro
@@ -1,5 +1,7 @@
 TARGET = qtquickcontrols2imaginestyleplugin
 TARGETPATH = QtQuick/Controls.2/Imagine
+
+IMPORT_NAME = QtQuick.Controls.Imagine
 IMPORT_VERSION = 2.5
 
 QT += qml quick
diff --git a/src/imports/controls/material/material.pro b/src/imports/controls/material/material.pro
index c3cbb355..c2a55a61 100644
--- a/src/imports/controls/material/material.pro
+++ b/src/imports/controls/material/material.pro
@@ -1,5 +1,7 @@
 TARGET = qtquickcontrols2materialstyleplugin
 TARGETPATH = QtQuick/Controls.2/Material
+
+IMPORT_NAME = QtQuick.Controls.Material
 IMPORT_VERSION = 2.5
 
 QT += qml quick
diff --git a/src/imports/controls/universal/universal.pro b/src/imports/controls/universal/universal.pro
index 399de032..deea7878 100644
--- a/src/imports/controls/universal/universal.pro
+++ b/src/imports/controls/universal/universal.pro
@@ -1,5 +1,7 @@
 TARGET = qtquickcontrols2universalstyleplugin
 TARGETPATH = QtQuick/Controls.2/Universal
+
+IMPORT_NAME = QtQuick.Controls.Universal
 IMPORT_VERSION = 2.5
 
 QT += qml quick