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

Conflicts:
	src/imports/controls/ComboBox.qml
	src/imports/controls/material/ComboBox.qml
	src/imports/controls/universal/ComboBox.qml

Change-Id: Ib900bb6298c32245399f52980b44575b64b7409f

9 files changed, 47 insertions, 9 deletions

diff --git a/src/imports/controls/ComboBox.qml b/src/imports/controls/ComboBox.qml
index b19b8e14..83492aef 100644
--- a/src/imports/controls/ComboBox.qml
+++ b/src/imports/controls/ComboBox.qml
@@ -35,7 +35,6 @@
 ****************************************************************************/
 
 import QtQuick 2.9
-import QtQuick.Window 2.2
 import QtQuick.Controls 2.3
 import QtQuick.Controls.impl 2.3
 import QtQuick.Templates 2.3 as T
diff --git a/src/imports/controls/Popup.qml b/src/imports/controls/Popup.qml
index e97aee52..7a94aaab 100644
--- a/src/imports/controls/Popup.qml
+++ b/src/imports/controls/Popup.qml
@@ -45,7 +45,7 @@ T.Popup {
     implicitWidth: Math.max(background ? background.implicitWidth : 0,
                             contentWidth > 0 ? contentWidth + leftPadding + rightPadding : 0)
     implicitHeight: Math.max(background ? background.implicitHeight : 0,
-                             contentWidth > 0 ? contentHeight + topPadding + bottomPadding : 0)
+                             contentHeight > 0 ? contentHeight + topPadding + bottomPadding : 0)
 
     contentWidth: contentItem.implicitWidth || (contentChildren.length === 1 ? contentChildren[0].implicitWidth : 0)
     contentHeight: contentItem.implicitHeight || (contentChildren.length === 1 ? contentChildren[0].implicitHeight : 0)
diff --git a/src/imports/controls/doc/src/qtquickcontrols2-customize.qdoc b/src/imports/controls/doc/src/qtquickcontrols2-customize.qdoc
index 633fb217..c2b1e640 100644
--- a/src/imports/controls/doc/src/qtquickcontrols2-customize.qdoc
+++ b/src/imports/controls/doc/src/qtquickcontrols2-customize.qdoc
@@ -200,9 +200,9 @@
     style will illustrate the elevation with a drop shadow; the higher the
     elevation, the larger the shadow.
 
-    The first step is to \l {Creating Qt Quick Projects}{create a new Qt Quick
+    The first step is to \l {Qt Creator: Creating Qt Quick Projects}{create a new Qt Quick
     Controls 2 application} in Qt Creator. After that, we
-    \l {Creating C++ Classes}{add a C++ type} that stores the elevation. Since
+    \l {Qt Creator: Creating C++ Classes}{add a C++ type} that stores the elevation. Since
     the type will be used for every control supported by our style, and because
     we may wish to add other attached properties later on, we'll call it
     MyStyle. Here is \c MyStyle.h:
diff --git a/src/imports/controls/doc/src/qtquickcontrols2-index.qdoc b/src/imports/controls/doc/src/qtquickcontrols2-index.qdoc
index 90d0c9d7..99b6c2ea 100644
--- a/src/imports/controls/doc/src/qtquickcontrols2-index.qdoc
+++ b/src/imports/controls/doc/src/qtquickcontrols2-index.qdoc
@@ -60,6 +60,48 @@
 
     For more details, see \l {Getting Started with Qt Quick Controls 2}.
 
+    \section1 Versions
+
+    Qt Quick Controls 2.0 was released in Qt 5.7. Subsequent minor Qt releases
+    increment the import version of the Qt Quick Controls 2 modules by one. The
+    experimental Qt Labs modules use import version 1.0.
+
+    \table
+      \header
+        \li \c Qt
+        \li \l {Qt Quick QML Types}{\c QtQuick}
+        \li \l {Qt Quick Controls 2 QML Types}{\c QtQuick.Controls},\br
+            \l {Qt Quick Templates 2 QML Types}{\c QtQuick.Templates},
+        \li \l {Material Style}{\c QtQuick.Controls.Material},\br
+            \l {Universal Style}{\c QtQuick.Controls.Universal}
+        \li \l {Qt Labs Calendar QML Types}{\c Qt.labs.calendar},\br
+            \l {Qt Labs Platform QML Types}{\c Qt.labs.platform}
+      \row
+        \li 5.7
+        \li 2.7
+        \li 2.0
+        \li 2.0
+        \li 1.0
+      \row
+        \li 5.8
+        \li 2.8
+        \li 2.1
+        \li 2.1
+        \li 1.0
+      \row
+        \li 5.9
+        \li 2.9
+        \li 2.2
+        \li 2.2
+        \li 1.0
+      \row
+        \li ...
+        \li ...
+        \li ...
+        \li ...
+        \li ...
+    \endtable
+
     \section1 Important Concepts in Qt Quick Controls 2
 
     \list
diff --git a/src/imports/controls/material/ComboBox.qml b/src/imports/controls/material/ComboBox.qml
index e86d9f4c..2d2a479e 100644
--- a/src/imports/controls/material/ComboBox.qml
+++ b/src/imports/controls/material/ComboBox.qml
@@ -35,7 +35,6 @@
 ****************************************************************************/
 
 import QtQuick 2.9
-import QtQuick.Window 2.2
 import QtQuick.Controls 2.3
 import QtQuick.Templates 2.3 as T
 import QtQuick.Controls.Material 2.3
diff --git a/src/imports/controls/material/Popup.qml b/src/imports/controls/material/Popup.qml
index e270b77d..49b39a6c 100644
--- a/src/imports/controls/material/Popup.qml
+++ b/src/imports/controls/material/Popup.qml
@@ -47,7 +47,7 @@ T.Popup {
     implicitWidth: Math.max(background ? background.implicitWidth : 0,
                             contentWidth > 0 ? contentWidth + leftPadding + rightPadding : 0)
     implicitHeight: Math.max(background ? background.implicitHeight : 0,
-                             contentWidth > 0 ? contentHeight + topPadding + bottomPadding : 0)
+                             contentHeight > 0 ? contentHeight + topPadding + bottomPadding : 0)
 
     contentWidth: contentItem.implicitWidth || (contentChildren.length === 1 ? contentChildren[0].implicitWidth : 0)
     contentHeight: contentItem.implicitHeight || (contentChildren.length === 1 ? contentChildren[0].implicitHeight : 0)
diff --git a/src/imports/controls/universal/ComboBox.qml b/src/imports/controls/universal/ComboBox.qml
index cf2a7e28..89391613 100644
--- a/src/imports/controls/universal/ComboBox.qml
+++ b/src/imports/controls/universal/ComboBox.qml
@@ -35,7 +35,6 @@
 ****************************************************************************/
 
 import QtQuick 2.9
-import QtQuick.Window 2.2
 import QtQuick.Controls 2.3
 import QtQuick.Templates 2.3 as T
 import QtQuick.Controls.Universal 2.3
diff --git a/src/imports/controls/universal/Popup.qml b/src/imports/controls/universal/Popup.qml
index 8c0b8d8f..f844d8e1 100644
--- a/src/imports/controls/universal/Popup.qml
+++ b/src/imports/controls/universal/Popup.qml
@@ -44,7 +44,7 @@ T.Popup {
     implicitWidth: Math.max(background ? background.implicitWidth : 0,
                             contentWidth > 0 ? contentWidth + leftPadding + rightPadding : 0)
     implicitHeight: Math.max(background ? background.implicitHeight : 0,
-                             contentWidth > 0 ? contentHeight + topPadding + bottomPadding : 0)
+                             contentHeight > 0 ? contentHeight + topPadding + bottomPadding : 0)
 
     contentWidth: contentItem.implicitWidth || (contentChildren.length === 1 ? contentChildren[0].implicitWidth : 0)
     contentHeight: contentItem.implicitHeight || (contentChildren.length === 1 ? contentChildren[0].implicitHeight : 0)
diff --git a/src/imports/controls/universal/SwipeDelegate.qml b/src/imports/controls/universal/SwipeDelegate.qml
index c737df35..60430d74 100644
--- a/src/imports/controls/universal/SwipeDelegate.qml
+++ b/src/imports/controls/universal/SwipeDelegate.qml
@@ -66,7 +66,6 @@ T.SwipeDelegate {
         visible: control.text
         horizontalAlignment: Text.AlignLeft
         verticalAlignment: Text.AlignVCenter
-        renderType: Text.NativeRendering
 
         opacity: enabled ? 1.0 : 0.2
         color: control.Universal.foreground