diff options
| author | Liang Qi <liang.qi@nokia.com> | 2011-05-27 13:25:50 (GMT) |
|---|---|---|
| committer | Liang Qi <liang.qi@nokia.com> | 2011-05-27 13:25:50 (GMT) |
| commit | 9e4ded47bc9e3fed3ee2a15e572603bb3f7b48fc (patch) | |
| tree | 09a609ee6f560390d7385e524421d16d6d43f083 /examples/declarative | |
| parent | c09b481edd82942cdc85d138c2160004bd71a54e (diff) | |
| parent | 271a96f201ebcd346bb532e207c1d0e465f89584 (diff) | |
| download | Qt-9e4ded47bc9e3fed3ee2a15e572603bb3f7b48fc.zip Qt-9e4ded47bc9e3fed3ee2a15e572603bb3f7b48fc.tar.gz Qt-9e4ded47bc9e3fed3ee2a15e572603bb3f7b48fc.tar.bz2 | |
Merge branch '4.8' into qt-4.8-from-4.7
Conflicts:
src/s60installs/bwins/QtGuiu.def
src/s60installs/bwins/QtOpenGLu.def
Diffstat (limited to 'examples/declarative')
| -rw-r--r-- | examples/declarative/keyinteraction/focus/Core/GridMenu.qml | 2 | ||||
| -rw-r--r-- | examples/declarative/keyinteraction/focus/Core/ListViewDelegate.qml | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/examples/declarative/keyinteraction/focus/Core/GridMenu.qml b/examples/declarative/keyinteraction/focus/Core/GridMenu.qml index f3894fb..224d38b 100644 --- a/examples/declarative/keyinteraction/focus/Core/GridMenu.qml +++ b/examples/declarative/keyinteraction/focus/Core/GridMenu.qml @@ -86,7 +86,7 @@ FocusScope { hoverEnabled: true onClicked: { - GridView.view.currentIndex = index + container.GridView.view.currentIndex = index container.forceActiveFocus() } } diff --git a/examples/declarative/keyinteraction/focus/Core/ListViewDelegate.qml b/examples/declarative/keyinteraction/focus/Core/ListViewDelegate.qml index 88c3624..8f9d022 100644 --- a/examples/declarative/keyinteraction/focus/Core/ListViewDelegate.qml +++ b/examples/declarative/keyinteraction/focus/Core/ListViewDelegate.qml @@ -68,7 +68,7 @@ Item { hoverEnabled: true onClicked: { - ListView.view.currentIndex = index + container.ListView.view.currentIndex = index container.forceActiveFocus() } } |