Merge remote-tracking branch 'origin/5.6' into 5.7

Conflicts:
	src/templates/qquickpopup.cpp

Change-Id: Ic5cdde7a2d9daa0e616de999969a4399db23245b

17 files changed, 3 insertions, 17 deletions

diff --git a/src/imports/controls/material/Popup.qml b/src/imports/controls/material/Popup.qml
index 649c5837..8fa9f7f7 100644
--- a/src/imports/controls/material/Popup.qml
+++ b/src/imports/controls/material/Popup.qml
@@ -68,6 +68,7 @@ T.Popup {
         radius: 3
         color: control.Material.dialogColor
 
+        layer.enabled: true
         layer.effect: DropShadow {
             verticalOffset: 1
             color: control.Material.dropShadowColor
diff --git a/src/imports/controls/universal/Button.qml b/src/imports/controls/universal/Button.qml
index 18b242ca..5198b756 100644
--- a/src/imports/controls/universal/Button.qml
+++ b/src/imports/controls/universal/Button.qml
@@ -61,7 +61,6 @@ T.Button {
         elide: Text.ElideRight
         horizontalAlignment: Text.AlignHCenter
         verticalAlignment: Text.AlignVCenter
-        renderType: Text.NativeRendering
 
         color: !control.enabled ? control.Universal.baseLowColor : control.Universal.baseHighColor
     }
diff --git a/src/imports/controls/universal/CheckBox.qml b/src/imports/controls/universal/CheckBox.qml
index b5442c57..2dff0488 100644
--- a/src/imports/controls/universal/CheckBox.qml
+++ b/src/imports/controls/universal/CheckBox.qml
@@ -101,7 +101,6 @@ T.CheckBox {
         visible: control.text
         horizontalAlignment: Text.AlignLeft
         verticalAlignment: Text.AlignVCenter
-        renderType: Text.NativeRendering
 
         color: !control.enabled ? control.Universal.baseLowColor : control.Universal.baseHighColor
     }
diff --git a/src/imports/controls/universal/ComboBox.qml b/src/imports/controls/universal/ComboBox.qml
index f736ef96..fe6a033f 100644
--- a/src/imports/controls/universal/ComboBox.qml
+++ b/src/imports/controls/universal/ComboBox.qml
@@ -71,7 +71,6 @@ T.ComboBox {
         color: !control.enabled ? control.Universal.baseLowColor : control.Universal.baseHighColor
         horizontalAlignment: Text.AlignLeft
         verticalAlignment: Text.AlignVCenter
-        renderType: Text.NativeRendering
         elide: Text.ElideRight
         rightPadding: 12 + control.spacing
     }
diff --git a/src/imports/controls/universal/GroupBox.qml b/src/imports/controls/universal/GroupBox.qml
index 5b25fc75..2b8ae935 100644
--- a/src/imports/controls/universal/GroupBox.qml
+++ b/src/imports/controls/universal/GroupBox.qml
@@ -68,7 +68,6 @@ T.GroupBox {
         elide: Text.ElideRight
         horizontalAlignment: Text.AlignLeft
         verticalAlignment: Text.AlignVCenter
-        renderType: Text.NativeRendering
     }
     //! [label]
 
diff --git a/src/imports/controls/universal/ItemDelegate.qml b/src/imports/controls/universal/ItemDelegate.qml
index 406bdb42..3296a7cd 100644
--- a/src/imports/controls/universal/ItemDelegate.qml
+++ b/src/imports/controls/universal/ItemDelegate.qml
@@ -76,7 +76,6 @@ T.ItemDelegate {
         visible: control.text
         horizontalAlignment: Text.AlignLeft
         verticalAlignment: Text.AlignVCenter
-        renderType: Text.NativeRendering
 
         color: !control.enabled ? control.Universal.baseLowColor : control.Universal.baseHighColor
     }
diff --git a/src/imports/controls/universal/Label.qml b/src/imports/controls/universal/Label.qml
index 0484959e..7630364c 100644
--- a/src/imports/controls/universal/Label.qml
+++ b/src/imports/controls/universal/Label.qml
@@ -43,5 +43,4 @@ T.Label {
 
     color: !control.enabled ? Universal.baseLowColor : Universal.baseHighColor
     linkColor: Universal.accent
-    renderType: Text.NativeRendering
 }
diff --git a/src/imports/controls/universal/RadioButton.qml b/src/imports/controls/universal/RadioButton.qml
index 45e77ac1..a391d670 100644
--- a/src/imports/controls/universal/RadioButton.qml
+++ b/src/imports/controls/universal/RadioButton.qml
@@ -107,7 +107,6 @@ T.RadioButton {
         visible: control.text
         horizontalAlignment: Text.AlignLeft
         verticalAlignment: Text.AlignVCenter
-        renderType: Text.NativeRendering
 
         color: !control.enabled ? control.Universal.baseLowColor : control.Universal.baseHighColor
     }
diff --git a/src/imports/controls/universal/SpinBox.qml b/src/imports/controls/universal/SpinBox.qml
index b3185452..cfb18391 100644
--- a/src/imports/controls/universal/SpinBox.qml
+++ b/src/imports/controls/universal/SpinBox.qml
@@ -78,7 +78,6 @@ T.SpinBox {
         selectedTextColor: control.Universal.chromeWhiteColor
         horizontalAlignment: Qt.AlignHCenter
         verticalAlignment: TextInput.AlignVCenter
-        renderType: Text.NativeRendering
 
         readOnly: !control.editable
         validator: control.validator
diff --git a/src/imports/controls/universal/Switch.qml b/src/imports/controls/universal/Switch.qml
index f37c1054..dbbb3112 100644
--- a/src/imports/controls/universal/Switch.qml
+++ b/src/imports/controls/universal/Switch.qml
@@ -99,7 +99,6 @@ T.Switch {
         visible: control.text
         horizontalAlignment: Text.AlignLeft
         verticalAlignment: Text.AlignVCenter
-        renderType: Text.NativeRendering
 
         color: !control.enabled ? control.Universal.baseLowColor : control.Universal.baseHighColor
     }
diff --git a/src/imports/controls/universal/TabButton.qml b/src/imports/controls/universal/TabButton.qml
index b332160b..e49bfadd 100644
--- a/src/imports/controls/universal/TabButton.qml
+++ b/src/imports/controls/universal/TabButton.qml
@@ -57,7 +57,6 @@ T.TabButton {
         color: control.checked || control.pressed ? control.Universal.baseHighColor : control.Universal.baseLowColor
         horizontalAlignment: Text.AlignHCenter
         verticalAlignment: Text.AlignVCenter
-        renderType: Text.NativeRendering
     }
     //! [contentItem]
 }
diff --git a/src/imports/controls/universal/TextArea.qml b/src/imports/controls/universal/TextArea.qml
index 4f3f8a34..80d62cf4 100644
--- a/src/imports/controls/universal/TextArea.qml
+++ b/src/imports/controls/universal/TextArea.qml
@@ -60,7 +60,6 @@ T.TextArea {
             activeFocus ? Universal.chromeBlackHighColor : Universal.baseHighColor
     selectionColor: Universal.accent
     selectedTextColor: Universal.chromeWhiteColor
-    renderType: Text.NativeRendering
 
     Text {
         id: placeholder
@@ -76,7 +75,6 @@ T.TextArea {
         visible: !control.length && !control.preeditText && (!control.activeFocus || control.horizontalAlignment !== Qt.AlignHCenter)
         horizontalAlignment: control.horizontalAlignment
         verticalAlignment: control.verticalAlignment
-        renderType: Text.NativeRendering
         elide: Text.ElideRight
     }
 
diff --git a/src/imports/controls/universal/TextField.qml b/src/imports/controls/universal/TextField.qml
index a0c854b2..288dad02 100644
--- a/src/imports/controls/universal/TextField.qml
+++ b/src/imports/controls/universal/TextField.qml
@@ -61,7 +61,6 @@ T.TextField {
     selectionColor: Universal.accent
     selectedTextColor: Universal.chromeWhiteColor
     verticalAlignment: TextInput.AlignVCenter
-    renderType: Text.NativeRendering
 
     Text {
         id: placeholder
@@ -77,7 +76,6 @@ T.TextField {
         visible: !control.length && !control.preeditText && (!control.activeFocus || control.horizontalAlignment !== Qt.AlignHCenter)
         horizontalAlignment: control.horizontalAlignment
         verticalAlignment: control.verticalAlignment
-        renderType: Text.NativeRendering
         elide: Text.ElideRight
     }
 
diff --git a/src/imports/controls/universal/ToolButton.qml b/src/imports/controls/universal/ToolButton.qml
index f5fd5c88..57d5d045 100644
--- a/src/imports/controls/universal/ToolButton.qml
+++ b/src/imports/controls/universal/ToolButton.qml
@@ -59,7 +59,6 @@ T.ToolButton {
         elide: Text.ElideRight
         horizontalAlignment: Text.AlignHCenter
         verticalAlignment: Text.AlignVCenter
-        renderType: Text.NativeRendering
     }
     //! [contentItem]
 
diff --git a/src/imports/controls/universal/Tumbler.qml b/src/imports/controls/universal/Tumbler.qml
index d327733c..e1efca06 100644
--- a/src/imports/controls/universal/Tumbler.qml
+++ b/src/imports/controls/universal/Tumbler.qml
@@ -53,7 +53,6 @@ T.Tumbler {
         opacity: 0.4 + Math.max(0, 1 - Math.abs(Tumbler.displacement)) * 0.6
         horizontalAlignment: Text.AlignHCenter
         verticalAlignment: Text.AlignVCenter
-        renderType: Text.NativeRendering
     }
     //! [delegate]
 
diff --git a/src/imports/templates/qtlabstemplatesplugin.cpp b/src/imports/templates/qtlabstemplatesplugin.cpp
index be7882c4..bdf35802 100644
--- a/src/imports/templates/qtlabstemplatesplugin.cpp
+++ b/src/imports/templates/qtlabstemplatesplugin.cpp
@@ -145,6 +145,7 @@ void QtLabsTemplatesPlugin::registerTypes(const char *uri)
     qmlRegisterType<QQuickTumblerAttached>();
     qmlRegisterType<QQuickTumbler>(uri, 1, 0, "Tumbler");
 
+    qmlRegisterRevision<QQuickItem, 2>(uri, 1, 0);
     qmlRegisterRevision<QQuickWindow, 2>(uri, 1, 0);
     qmlRegisterRevision<QQuickText, 6>(uri, 1, 0);
     qmlRegisterRevision<QQuickTextInput, 6>(uri, 1, 0);
diff --git a/src/templates/qquickpopup.cpp b/src/templates/qquickpopup.cpp
index 35185cef..ff58ab83 100644
--- a/src/templates/qquickpopup.cpp
+++ b/src/templates/qquickpopup.cpp
@@ -1196,7 +1196,7 @@ void QQuickPopup::setParentItem(QQuickItem *parent)
     d->parentItem = parent;
     if (d->positioner.parentItem())
         d->positioner.setParentItem(parent);
-    if (d->popupItem) {
+    if (parent) {
         QQuickControlPrivate::updateFontRecur(d->popupItem, QQuickControlPrivate::naturalControlFont(parent));
         QQuickControlPrivate::updateLocaleRecur(d->popupItem, QQuickControlPrivate::calcLocale(parent));
     }