diff options
| author | Aaron Kennedy <aaron.kennedy@nokia.com> | 2010-04-21 06:41:27 (GMT) |
|---|---|---|
| committer | Aaron Kennedy <aaron.kennedy@nokia.com> | 2010-04-21 06:41:27 (GMT) |
| commit | fbfcc8eb1861ceeed50f7701161ca80a6467f367 (patch) | |
| tree | c6857f3f654349a6fda163b63404573cc5db3261 /examples | |
| parent | 52b516d51bc817e8b7a36955365d2c5cd90c2196 (diff) | |
| parent | 3e48bdc1562d1f067bf48422b34514a1e76a40a4 (diff) | |
| download | Qt-fbfcc8eb1861ceeed50f7701161ca80a6467f367.zip Qt-fbfcc8eb1861ceeed50f7701161ca80a6467f367.tar.gz Qt-fbfcc8eb1861ceeed50f7701161ca80a6467f367.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7
Diffstat (limited to 'examples')
| -rw-r--r-- | examples/declarative/focus/Core/GridMenu.qml | 4 | ||||
| -rw-r--r-- | examples/declarative/focus/Core/ListViewDelegate.qml | 5 |
2 files changed, 2 insertions, 7 deletions
diff --git a/examples/declarative/focus/Core/GridMenu.qml b/examples/declarative/focus/Core/GridMenu.qml index c37b17a..3f727fd 100644 --- a/examples/declarative/focus/Core/GridMenu.qml +++ b/examples/declarative/focus/Core/GridMenu.qml @@ -43,9 +43,7 @@ FocusScope { onClicked: { GridView.view.currentIndex = index - container.focus = true - gridMenu.focus = true - mainView.focus = true + container.forceFocus() } } diff --git a/examples/declarative/focus/Core/ListViewDelegate.qml b/examples/declarative/focus/Core/ListViewDelegate.qml index 96324d7..8f4763e 100644 --- a/examples/declarative/focus/Core/ListViewDelegate.qml +++ b/examples/declarative/focus/Core/ListViewDelegate.qml @@ -26,10 +26,7 @@ Component { onClicked: { ListView.view.currentIndex = index - container.focus = true - ListView.view.focus = true - listViews.focus = true - mainView.focus = true + container.forceFocus() } } |