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 /tools | |
| 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 'tools')
| -rw-r--r-- | tools/qmlviewer/content/Browser.qml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tools/qmlviewer/content/Browser.qml b/tools/qmlviewer/content/Browser.qml index 446045b..35120bc 100644 --- a/tools/qmlviewer/content/Browser.qml +++ b/tools/qmlviewer/content/Browser.qml @@ -90,7 +90,7 @@ Rectangle { font.pixelSize: 32 color: (wrapper.ListView.isCurrentItem && root.keyPressed) ? palette.highlightedText : palette.windowText } - MouseRegion { + MouseArea { id: mouseRegion anchors.fill: parent onClicked: { launch() } @@ -211,7 +211,7 @@ Rectangle { color: "transparent" Image { anchors.centerIn: parent; source: "images/up.png" } - MouseRegion { id: upRegion; anchors.centerIn: parent + MouseArea { id: upRegion; anchors.centerIn: parent width: 56 height: 56 onClicked: if (folders.parentFolder != "") up() |