summaryrefslogtreecommitdiffstats
path: root/examples
diff options
context:
space:
mode:
authorFrederik Gladhorn <gladhorn@kde.org>2009-09-07 13:47:08 (GMT)
committerThorbjørn Lindeijer <thorbjorn.lindeijer@nokia.com>2009-09-07 13:47:08 (GMT)
commit89e0ecfb4afe8b6f1d8cbfe64cfd493ad423919e (patch)
tree027747a7b61fe2d660ef2a30253c3674fbd958ad /examples
parent8252ee3f13f9d8043153e3bbd337f951ffaf49bf (diff)
downloadQt-89e0ecfb4afe8b6f1d8cbfe64cfd493ad423919e.zip
Qt-89e0ecfb4afe8b6f1d8cbfe64cfd493ad423919e.tar.gz
Qt-89e0ecfb4afe8b6f1d8cbfe64cfd493ad423919e.tar.bz2
fix tutorial 3 - qmlviewer bails out with "id conflicts with type name"
the reason is that MouseRegion is used as id Merge-request: 1443 Reviewed-by: Thorbjørn Lindeijer <thorbjorn.lindeijer@nokia.com>
Diffstat (limited to 'examples')
-rw-r--r--examples/declarative/tutorials/helloworld/t3/tutorial3.qml4
1 files changed, 2 insertions, 2 deletions
diff --git a/examples/declarative/tutorials/helloworld/t3/tutorial3.qml b/examples/declarative/tutorials/helloworld/t3/tutorial3.qml
index 81e1f6a..426640d 100644
--- a/examples/declarative/tutorials/helloworld/t3/tutorial3.qml
+++ b/examples/declarative/tutorials/helloworld/t3/tutorial3.qml
@@ -15,7 +15,7 @@ Rectangle {
states: [
State {
name: "down"
- when: MouseRegion.pressed == true
+ when: MouseRegionId.pressed == true
PropertyChanges {
target: HelloText
y: 160
@@ -39,7 +39,7 @@ Rectangle {
}
]
}
- MouseRegion { id: MouseRegion; anchors.fill: HelloText }
+ MouseRegion { id: MouseRegionId; anchors.fill: HelloText }
Grid {
id: ColorPicker
x: 0