summaryrefslogtreecommitdiffstats
path: root/examples/declarative/tutorials/samegame/samegame2/Button.qml
diff options
context:
space:
mode:
authorAaron McCarthy <aaron.mccarthy@nokia.com>2010-02-23 05:17:41 (GMT)
committerAaron McCarthy <aaron.mccarthy@nokia.com>2010-02-23 05:17:41 (GMT)
commit3083b436bd3adc6280d3b7ebcb75358454cb9623 (patch)
tree0eb451db7cc183c126e19617faa26b12f8af3c51 /examples/declarative/tutorials/samegame/samegame2/Button.qml
parent055fa76e7575be55899127de2d254e0f0e90a1db (diff)
parent39d728dd76efa10ca297b76ed08a5cd1c0235b3f (diff)
downloadQt-3083b436bd3adc6280d3b7ebcb75358454cb9623.zip
Qt-3083b436bd3adc6280d3b7ebcb75358454cb9623.tar.gz
Qt-3083b436bd3adc6280d3b7ebcb75358454cb9623.tar.bz2
Merge remote branch 'origin/master' into bearermanagement/staging
Diffstat (limited to 'examples/declarative/tutorials/samegame/samegame2/Button.qml')
-rw-r--r--examples/declarative/tutorials/samegame/samegame2/Button.qml2
1 files changed, 1 insertions, 1 deletions
diff --git a/examples/declarative/tutorials/samegame/samegame2/Button.qml b/examples/declarative/tutorials/samegame/samegame2/Button.qml
index 63cd555..6629302 100644
--- a/examples/declarative/tutorials/samegame/samegame2/Button.qml
+++ b/examples/declarative/tutorials/samegame/samegame2/Button.qml
@@ -17,7 +17,7 @@ Rectangle {
GradientStop { position: 1.0; color: activePalette.button }
}
- MouseRegion { id: mr; anchors.fill: parent; onClicked: container.clicked() }
+ MouseArea { id: mr; anchors.fill: parent; onClicked: container.clicked() }
Text {
id: txtItem; text: container.text; anchors.centerIn: container; color: activePalette.buttonText