diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-03-14 09:30:12 +0100 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-03-14 09:30:12 +0100 |
| commit | 11484c7f64b5942994a1d1a07f4e7f4d86e94e83 (patch) | |
| tree | f0c901d1d15d0bcb8ce572a04b094e510cd86ddd /examples/quick/tutorials | |
| parent | a1a7679028eda395d74cd1247a8c3ed46ac3bef1 (diff) | |
| parent | b58953fae3dc80c52e846d2d87856dd20b8986ab (diff) | |
Merge remote-tracking branch 'origin/stable' into dev
Conflicts:
tests/auto/qml/debugger/qv8profilerservice/qv8profilerservice.pro
Change-Id: I2fd99ed8bd03302b9bbf31e6f21990f6455c4f1c
Diffstat (limited to 'examples/quick/tutorials')
| -rw-r--r-- | examples/quick/tutorials/gettingStartedQml/core/FileDialog.qml | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/examples/quick/tutorials/gettingStartedQml/core/FileDialog.qml b/examples/quick/tutorials/gettingStartedQml/core/FileDialog.qml index 3564b0d06d..dc3ad09c9c 100644 --- a/examples/quick/tutorials/gettingStartedQml/core/FileDialog.qml +++ b/examples/quick/tutorials/gettingStartedQml/core/FileDialog.qml @@ -102,8 +102,8 @@ Rectangle { anchors.centerIn: parent text: name color: "#BDCACD" - font.weight: GridView.view.currentIndex == index ? Font.DemiBold : Font.Normal - font.pointSize: GridView.view.currentIndex == index ? 12 : 10 + font.weight: dirView.currentIndex == index ? Font.DemiBold : Font.Normal + font.pointSize: dirView.currentIndex == index ? 12 : 10 elide: Text.ElideMiddle horizontalAlignment: Text.AlignHCenter } @@ -113,8 +113,8 @@ Rectangle { anchors.centerIn: parent radius: 10 antialiasing: true - scale: GridView.view.currentIndex == index ? 1 : 0.5 - opacity: GridView.view.currentIndex == index ? 1 : 0 + scale: dirView.currentIndex == index ? 1 : 0.5 + opacity: dirView.currentIndex == index ? 1 : 0 Text { id: overlay width: parent.width @@ -141,7 +141,7 @@ Rectangle { hoverEnabled: true onClicked: { - GridView.view.currentIndex = index + dirView.currentIndex = index selectedFile = directory.files[index].name selectChanged() } |