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

Change-Id: I655cffde559b94181021646dff617f8529854d70

5 files changed, 73 insertions, 0 deletions

diff --git a/src/imports/controls/designer/AbstractButtonSection.qml b/src/imports/controls/designer/AbstractButtonSection.qml
index 3d3dad5d..3cc50925 100644
--- a/src/imports/controls/designer/AbstractButtonSection.qml
+++ b/src/imports/controls/designer/AbstractButtonSection.qml
@@ -53,6 +53,19 @@ Section {
             }
         }
 
+         Label {
+            text: qsTr("Display")
+            tooltip: qsTr("Determines how the icon and text are displayed within the button.")
+        }
+        SecondColumnLayout {
+            ComboBox {
+                backendValue: backendValues.display
+                model: [ "IconOnly", "TextOnly", "TextBesideIcon" ]
+                scope: "AbstractButton"
+                Layout.fillWidth: true
+            }
+        }
+
         Label {
             visible: checkable
             text: qsTr("Checkable")
diff --git a/src/imports/controls/designer/ButtonSection.qml b/src/imports/controls/designer/ButtonSection.qml
index 15e23df9..038abab7 100644
--- a/src/imports/controls/designer/ButtonSection.qml
+++ b/src/imports/controls/designer/ButtonSection.qml
@@ -44,6 +44,28 @@ Section {
 
     SectionLayout {
         Label {
+            text: qsTr("AutoRepeat")
+            tooltip: qsTr("Whether the button repeats pressed(), released() and clicked() signals while the button is pressed and held down.")
+        }
+        SecondColumnLayout {
+            CheckBox {
+                text: backendValues.autoRepeat.valueToString
+                backendValue: backendValues.autoRepeat
+                Layout.fillWidth: true
+            }
+        }
+        Label {
+            text: qsTr("Flat")
+            tooltip: qsTr("Whether the button is flat.")
+        }
+        SecondColumnLayout {
+            CheckBox {
+                text: backendValues.flat.valueToString
+                backendValue: backendValues.flat
+                Layout.fillWidth: true
+            }
+        }
+        Label {
             text: qsTr("Highlighted")
             tooltip: qsTr("Whether the button is highlighted.")
         }
diff --git a/src/imports/controls/designer/ComboBoxSpecifics.qml b/src/imports/controls/designer/ComboBoxSpecifics.qml
index 3ed283ca..c5fc6781 100644
--- a/src/imports/controls/designer/ComboBoxSpecifics.qml
+++ b/src/imports/controls/designer/ComboBoxSpecifics.qml
@@ -70,6 +70,38 @@ Column {
                     Layout.fillWidth: true
                 }
             }
+        Label {
+            text: qsTr("Editable")
+            tooltip: qsTr("Whether the combo box is editable.")
+        }
+        SecondColumnLayout {
+            CheckBox {
+                text: backendValues.editable.valueToString
+                backendValue: backendValues.editable
+                Layout.fillWidth: true
+            }
+        }
+        Label {
+            text: qsTr("Flat")
+            tooltip: qsTr("Whether the combo box button is flat.")
+        }
+        SecondColumnLayout {
+            CheckBox {
+                text: backendValues.flat.valueToString
+                backendValue: backendValues.flat
+                Layout.fillWidth: true
+            }
+        }
+        Label {
+                text: qsTr("DisplayText")
+                tooltip: qsTr("Holds the text that is displayed on the combo box button.")
+            }
+            SecondColumnLayout {
+                LineEdit {
+                    backendValue: backendValues.displayText
+                    Layout.fillWidth: true
+                }
+            }
         }
     }
 
diff --git a/src/imports/platform/qquickplatformcolordialog.cpp b/src/imports/platform/qquickplatformcolordialog.cpp
index 55957896..9b0283d0 100644
--- a/src/imports/platform/qquickplatformcolordialog.cpp
+++ b/src/imports/platform/qquickplatformcolordialog.cpp
@@ -185,6 +185,7 @@ void QQuickPlatformColorDialog::onCreate(QPlatformDialogHelper *dialog)
 {
     if (QPlatformColorDialogHelper *colorDialog = qobject_cast<QPlatformColorDialogHelper *>(dialog)) {
         connect(colorDialog, &QPlatformColorDialogHelper::currentColorChanged, this, &QQuickPlatformColorDialog::currentColorChanged);
+        colorDialog->setCurrentColor(m_currentColor);
         colorDialog->setOptions(m_options);
     }
 }
diff --git a/src/quicktemplates2/qquickdeferredexecute_p_p.h b/src/quicktemplates2/qquickdeferredexecute_p_p.h
index 400c5734..29d95ee9 100644
--- a/src/quicktemplates2/qquickdeferredexecute_p_p.h
+++ b/src/quicktemplates2/qquickdeferredexecute_p_p.h
@@ -51,6 +51,8 @@
 #include <QtCore/qglobal.h>
 #include <QtQuickTemplates2/private/qquickdeferredpointer_p_p.h>
 
+#include <QtQml/private/qqmlvme_p.h>
+
 QT_BEGIN_NAMESPACE
 
 class QString;
@@ -65,6 +67,9 @@ namespace QtQuickPrivate {
 template<typename T>
 void quickBeginDeferred(QObject *object, const QString &property, QQuickDeferredPointer<T> &delegate)
 {
+    if (!QQmlVME::componentCompleteEnabled())
+           return;
+
     delegate.setExecuting(true);
     QtQuickPrivate::beginDeferred(object, property);
     delegate.setExecuting(false);