diff options
| author | Thiago Macieira <thiago.macieira@nokia.com> | 2010-02-23 12:02:52 (GMT) |
|---|---|---|
| committer | Thiago Macieira <thiago.macieira@nokia.com> | 2010-02-23 12:02:52 (GMT) |
| commit | de4332a4728e739b37e9c7b04c021e150e096270 (patch) | |
| tree | 619aae505826654f3d89492efa53f758214fea6f /demos/declarative/flickr/mobile/GridDelegate.qml | |
| parent | a419d587a666aaf55310b3a18e9f9e1993fef16e (diff) | |
| parent | 3db40b0be40c946f547f238ed3f0af813892115e (diff) | |
| download | Qt-de4332a4728e739b37e9c7b04c021e150e096270.zip Qt-de4332a4728e739b37e9c7b04c021e150e096270.tar.gz Qt-de4332a4728e739b37e9c7b04c021e150e096270.tar.bz2 | |
Merge remote branch 'origin/master'
Conflicts:
doc/src/declarative/advtutorial1.qdoc
doc/src/declarative/tutorial2.qdoc
doc/src/declarative/tutorial3.qdoc
src/declarative/graphicsitems/qmlgraphicsmousearea.cpp
src/multimedia/playback/qmediaplayer.cpp
Diffstat (limited to 'demos/declarative/flickr/mobile/GridDelegate.qml')
| -rw-r--r-- | demos/declarative/flickr/mobile/GridDelegate.qml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/demos/declarative/flickr/mobile/GridDelegate.qml b/demos/declarative/flickr/mobile/GridDelegate.qml index 6c12896..0f5b69c 100644 --- a/demos/declarative/flickr/mobile/GridDelegate.qml +++ b/demos/declarative/flickr/mobile/GridDelegate.qml @@ -67,6 +67,6 @@ } ] } - MouseRegion { anchors.fill: wrapper; onClicked: { photoClicked() } } + MouseArea { anchors.fill: wrapper; onClicked: { photoClicked() } } } } |