summaryrefslogtreecommitdiff
path: root/examples/declarative/touchinteraction/mousearea
diff options
context:
space:
mode:
authorOswald Buddenhagen <oswald.buddenhagen@digia.com>2014-01-17 19:33:29 +0100
committerThe Qt Project <gerrit-noreply@qt-project.org>2014-02-20 16:53:10 +0100
commita0d27513f4eff3f76fd85e6442aca443b7c05a53 (patch)
tree2239ed849796744299fbe25ab3cc50c2867160e9 /examples/declarative/touchinteraction/mousearea
parent9ba631edb469599d3973982f8d5d72a9ba059eab (diff)
downloadqtquick1-a0d27513f4eff3f76fd85e6442aca443b7c05a53.tar.gz
whitespace fixes
remove trailing spaces & expand tabs Change-Id: Ia088c8cc8a83d068f6e2ec84903b5220cd3411f1 Reviewed-by: Alan Alpert <aalpert@blackberry.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Diffstat (limited to 'examples/declarative/touchinteraction/mousearea')
-rw-r--r--examples/declarative/touchinteraction/mousearea/mousearea-example/mousearea-example.pro4
-rw-r--r--examples/declarative/touchinteraction/mousearea/mousearea-example/qml/mousearea-example/mousearea-example.qml4
2 files changed, 4 insertions, 4 deletions
diff --git a/examples/declarative/touchinteraction/mousearea/mousearea-example/mousearea-example.pro b/examples/declarative/touchinteraction/mousearea/mousearea-example/mousearea-example.pro
index 9d984146..3d73ba49 100644
--- a/examples/declarative/touchinteraction/mousearea/mousearea-example/mousearea-example.pro
+++ b/examples/declarative/touchinteraction/mousearea/mousearea-example/mousearea-example.pro
@@ -14,8 +14,8 @@ DEFINES += ORIENTATIONLOCK
# DEFINES += QMLJSDEBUGGER
# If your application uses the Qt Mobility libraries, uncomment
-# the following lines and add the respective components to the
-# MOBILITY variable.
+# the following lines and add the respective components to the
+# MOBILITY variable.
# CONFIG += mobility
# MOBILITY +=
diff --git a/examples/declarative/touchinteraction/mousearea/mousearea-example/qml/mousearea-example/mousearea-example.qml b/examples/declarative/touchinteraction/mousearea/mousearea-example/qml/mousearea-example/mousearea-example.qml
index f2a7b59e..5d5fe4ec 100644
--- a/examples/declarative/touchinteraction/mousearea/mousearea-example/qml/mousearea-example/mousearea-example.qml
+++ b/examples/declarative/touchinteraction/mousearea/mousearea-example/qml/mousearea-example/mousearea-example.qml
@@ -53,7 +53,7 @@ Rectangle {
Text { text: "Click"; font.pixelSize: 16; anchors.centerIn: parent }
MouseArea {
- anchors.fill: parent
+ anchors.fill: parent
hoverEnabled: true
acceptedButtons: Qt.LeftButton | Qt.RightButton
@@ -61,7 +61,7 @@ Rectangle {
onExited: info.text = 'Exited (pressed=' + pressed + ')'
onPressed: {
- info.text = 'Pressed (button=' + (mouse.button == Qt.RightButton ? 'right' : 'left')
+ info.text = 'Pressed (button=' + (mouse.button == Qt.RightButton ? 'right' : 'left')
+ ' shift=' + (mouse.modifiers & Qt.ShiftModifier ? 'true' : 'false') + ')'
var posInBox = redSquare.mapToItem(box, mouse.x, mouse.y)
posInfo.text = + mouse.x + ',' + mouse.y + ' in square'