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

 Conflicts:
	src/imports/shapes/qquickshape.cpp
	src/imports/shapes/qquickshape_p_p.h
	src/qml/compiler/qqmlpropertycachecreator_p.h
	src/qml/jsruntime/qv4value_p.h
	src/quick/items/qquickloader_p.h
	tests/auto/qml/qqmlecmascript/tst_qqmlecmascript.cpp
	tools/qmlprofiler/qmlprofilerapplication.cpp

Change-Id: Iafc66ae84bf78630ed72a986acb678e9d19e3a69

1 files changed, 8 insertions, 4 deletions

diff --git a/examples/quick/demos/stocqt/content/StockSettingsPanel.qml b/examples/quick/demos/stocqt/content/StockSettingsPanel.qml
index 086eb2e8b6..48a77d8495 100644
--- a/examples/quick/demos/stocqt/content/StockSettingsPanel.qml
+++ b/examples/quick/demos/stocqt/content/StockSettingsPanel.qml
@@ -56,10 +56,10 @@ Rectangle {
     id: root
     color: "transparent"
 
-    property bool drawOpenPrice: openButton.buttonEnabled
-    property bool drawClosePrice: closeButton.buttonEnabled
-    property bool drawHighPrice: highButton.buttonEnabled
-    property bool drawLowPrice: lowButton.buttonEnabled
+    property bool drawOpenPrice: false
+    property bool drawClosePrice: false
+    property bool drawHighPrice: true
+    property bool drawLowPrice: true
 
     property string openColor: "#face20"
     property string closeColor: "#14aaff"
@@ -95,6 +95,7 @@ Rectangle {
         CheckBox {
             id: openButton
             buttonEnabled: false
+            onButtonEnabledChanged: drawOpenPrice = buttonEnabled
             Layout.rightMargin: 10
         }
 
@@ -114,6 +115,7 @@ Rectangle {
         CheckBox {
             id: closeButton
             buttonEnabled: false
+            onButtonEnabledChanged: drawClosePrice = buttonEnabled
             Layout.rightMargin: 10
         }
 
@@ -133,6 +135,7 @@ Rectangle {
         CheckBox {
             id: highButton
             buttonEnabled: true
+            onButtonEnabledChanged: drawHighPrice = buttonEnabled
             Layout.rightMargin: 10
         }
 
@@ -153,6 +156,7 @@ Rectangle {
         CheckBox {
             id: lowButton
             buttonEnabled: true
+            onButtonEnabledChanged: drawLowPrice = buttonEnabled
             Layout.rightMargin: 10
         }
     }