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

 Conflicts:
	src/scxml/qscxmlcompiler.cpp

Change-Id: I4abda984e523cdf2a0810ed7dc1773e055746e18

2 files changed, 18 insertions, 13 deletions

diff --git a/examples/scxml/calculator-qml/calculator-qml.qml b/examples/scxml/calculator-qml/calculator-qml.qml
index 386549e..c7d8236 100644
--- a/examples/scxml/calculator-qml/calculator-qml.qml
+++ b/examples/scxml/calculator-qml/calculator-qml.qml
@@ -79,8 +79,8 @@ Window {
         color: "#46a2da"
         Text {
             id: resultText
-            anchors.leftMargin: operations.implicitMargin
-            anchors.rightMargin: operations.implicitMargin
+            anchors.leftMargin: buttons.implicitMargin
+            anchors.rightMargin: buttons.implicitMargin
             anchors.fill: parent
             horizontalAlignment: Text.AlignRight
             verticalAlignment: Text.AlignVCenter
@@ -93,7 +93,7 @@ Window {
     }
 
     Item {
-        id: operations
+        id: buttons
         anchors.top: resultArea.bottom
         anchors.left: parent.left
         anchors.right: parent.right
@@ -102,12 +102,13 @@ Window {
             var ret = 0;
             for (var i = 0; i < visibleChildren.length; ++i) {
                 var child = visibleChildren[i];
-                ret += (child.implicitMargin || 0) / visibleChildren.length;
+                ret += (child.implicitMargin || 0);
             }
-            return ret;
+            return ret / visibleChildren.length;
         }
 
         Repeater {
+            id: operations
             model: ["÷", "×", "+", "-"]
             Button {
                 y: 0
@@ -130,6 +131,7 @@ Window {
         }
 
         Repeater {
+            id: digits
             model: ["7", "8", "9", "4", "5", "6", "1", "2", "3", "0", ".", "C"]
             Button {
                 x: (index % 3) * width
@@ -150,6 +152,7 @@ Window {
         }
 
         Button {
+            id: resultButton
             x: 3 * width
             y: parent.height / 5
             textHeight: y - 2
diff --git a/examples/scxml/mediaplayer-common/Mediaplayer.qml b/examples/scxml/mediaplayer-common/Mediaplayer.qml
index fdeb9d2..42a948a 100644
--- a/examples/scxml/mediaplayer-common/Mediaplayer.qml
+++ b/examples/scxml/mediaplayer-common/Mediaplayer.qml
@@ -119,22 +119,24 @@ Window {
         stateMachine: root.stateMachine
         events: ["playbackStarted", "playbackStopped"]
         onOccurred: {
-            var media = event.data.media
+            var media = event.data.media;
             if (event.name === "playbackStarted") {
-                theText.text = "Playing '" + media + "'"
+                theText.text = "Playing '" + media + "'";
                 theLog.text = theLog.text + "\nplaybackStarted with data: "
-                                          + JSON.stringify(event.data)
+                                          + JSON.stringify(event.data);
             } else if (event.name === "playbackStopped") {
-                theText.text = "Stopped '" + media + "'"
+                theText.text = "Stopped '" + media + "'";
                 theLog.text = theLog.text + "\nplaybackStopped with data: "
-                                          + JSON.stringify(event.data)
+                                          + JSON.stringify(event.data);
             }
         }
     }
 
+    // Submit tap event to state machine.
+    // "tap" toggles playing state of the current media.
     function tap(idx) {
-        var media = theModel.get(idx).media
-        var data = { "media": media }
-        stateMachine.submitEvent("tap", data)
+        var media = theModel.get(idx).media;
+        var data = { "media": media };
+        stateMachine.submitEvent("tap", data);
     }
 }