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

 Conflicts:
	.qmake.conf
	src/quicktemplates2/qquickabstractbutton_p.h

Change-Id: I265cbd2ce51beaf2afef99292c2e2798dadb4ba3

2 files changed, 9 insertions, 7 deletions

diff --git a/src/imports/controls/material/ComboBox.qml b/src/imports/controls/material/ComboBox.qml
index 0c7c7e74..a58f1a37 100644
--- a/src/imports/controls/material/ComboBox.qml
+++ b/src/imports/controls/material/ComboBox.qml
@@ -84,7 +84,7 @@ T.ComboBox {
 
         enabled: control.editable
         autoScroll: control.editable
-        readOnly: control.popup.visible
+        readOnly: control.down
         inputMethodHints: control.inputMethodHints
         validator: control.validator
 
@@ -161,7 +161,7 @@ T.ComboBox {
         contentItem: ListView {
             clip: true
             implicitHeight: contentHeight
-            model: control.popup.visible ? control.delegateModel : null
+            model: control.delegateModel
             currentIndex: control.highlightedIndex
             highlightMoveDuration: 0
 
@@ -170,7 +170,7 @@ T.ComboBox {
 
         background: Rectangle {
             radius: 2
-            color: control.popup.Material.dialogColor
+            color: parent.Material.dialogColor
 
             layer.enabled: control.enabled
             layer.effect: ElevationEffect {
diff --git a/src/imports/controls/material/plugins.qmltypes b/src/imports/controls/material/plugins.qmltypes
index 0ff64084..2ddf99a7 100644
--- a/src/imports/controls/material/plugins.qmltypes
+++ b/src/imports/controls/material/plugins.qmltypes
@@ -4,13 +4,14 @@ import QtQuick.tooling 1.2
 // It is used for QML tooling purposes only.
 //
 // This file was auto-generated by:
-// 'qmlplugindump -nonrelocatable QtQuick.Controls.Material 2.0'
+// 'qmlplugindump -nonrelocatable QtQuick.Controls.Material 2.3'
 
 Module {
     dependencies: []
+    Component { name: "QQuickAttachedObject"; prototype: "QObject" }
     Component {
         name: "QQuickMaterialStyle"
-        prototype: "QQuickStyle"
+        prototype: "QQuickAttachedObject"
         exports: ["QtQuick.Controls.Material/Material 2.0"]
         isCreatable: false
         exportMetaObjectRevisions: [0]
@@ -18,7 +19,8 @@ Module {
             name: "Theme"
             values: {
                 "Light": 0,
-                "Dark": 1
+                "Dark": 1,
+                "System": 2
             }
         }
         Enum {
@@ -69,6 +71,7 @@ Module {
         Property { name: "accent"; type: "QVariant" }
         Property { name: "foreground"; type: "QVariant" }
         Property { name: "background"; type: "QVariant" }
+        Property { name: "elevation"; type: "int" }
         Signal { name: "paletteChanged" }
         Method {
             name: "color"
@@ -88,5 +91,4 @@ Module {
             Parameter { name: "shade"; type: "Shade" }
         }
     }
-    Component { name: "QQuickStyle"; prototype: "QObject" }
 }