Avoid discouraged patterns in examples

In particular, use required properties where applicable, explicitly
import QtQml where we use it, avoid unqualified access into the root
scope of a component, use JavaScript functions with explicit parameters
as signal handlers.

Change-Id: I3eaaba47cc3c7a2a12d488e36f9eec145cedbb0e
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>

2 files changed, 5 insertions, 3 deletions

diff --git a/examples/quick/mousearea/mousearea-wheel-example.qml b/examples/quick/mousearea/mousearea-wheel-example.qml
index 44b9216285..5e8fba3ac3 100644
--- a/examples/quick/mousearea/mousearea-wheel-example.qml
+++ b/examples/quick/mousearea/mousearea-wheel-example.qml
@@ -63,6 +63,8 @@ Rectangle {
             model: ["#9ACD32", "#EEEEEE", "#FFD700", "#87CEEB"]
 
             Rectangle {
+                required property color modelData
+
                 property real scaleFactor: 1
 
                 height: 40 * scaleFactor
diff --git a/examples/quick/mousearea/mousearea.qml b/examples/quick/mousearea/mousearea.qml
index 1540d85fdd..cecbc2cfc8 100644
--- a/examples/quick/mousearea/mousearea.qml
+++ b/examples/quick/mousearea/mousearea.qml
@@ -76,7 +76,7 @@ Rectangle {
             onEntered: info.text = 'Entered'
             onExited: info.text = 'Exited (pressed=' + pressed + ')'
 
-            onPressed: {
+            onPressed: (mouse) => {
                 if (mouse.button == Qt.LeftButton)
                     buttonID = 'LeftButton'
                 else if (mouse.button == Qt.RightButton)
@@ -139,14 +139,14 @@ Rectangle {
                         + ' (' + posInBox.x + ',' + posInBox.y + ' in window)'
             }
 
-            onReleased: {
+            onReleased: (mouse) => {
                 btn.text = 'Released (isClick=' + mouse.isClick + ' wasHeld=' + mouse.wasHeld + ')'
                 posInfo.text = ''
             }
 
             //! [clicks]
             onPressAndHold: btn.text = 'Press and hold'
-            onClicked: btn.text = 'Clicked (wasHeld=' + mouse.wasHeld + ')'
+            onClicked: (mouse) => { btn.text = 'Clicked (wasHeld=' + mouse.wasHeld + ')' }
             onDoubleClicked: btn.text = 'Double clicked'
             //! [clicks]
         }