diff options
| author | David Boddie <david.boddie@nokia.com> | 2011-02-23 17:38:46 (GMT) |
|---|---|---|
| committer | David Boddie <david.boddie@nokia.com> | 2011-02-23 17:38:46 (GMT) |
| commit | 4501731349406110ecde2d260a8ab1e1bcedf179 (patch) | |
| tree | 5ec176e26bbd207741ca40a1704e654c30fb8571 /examples/declarative | |
| parent | 3c982b5d214cc7a37ace1d956ac8fb0b9a281722 (diff) | |
| parent | 0442b383dced6b5cc31e4fc2bf939e3125354f82 (diff) | |
| download | Qt-4501731349406110ecde2d260a8ab1e1bcedf179.zip Qt-4501731349406110ecde2d260a8ab1e1bcedf179.tar.gz Qt-4501731349406110ecde2d260a8ab1e1bcedf179.tar.bz2 | |
Merge commit 'refs/merge-requests/1108' of git://gitorious.org/qt/qt into merge-requests/1108
Conflicts:
doc/src/declarative/basictypes.qdoc
Diffstat (limited to 'examples/declarative')
| -rw-r--r-- | examples/declarative/keyinteraction/focus/focus.qml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/examples/declarative/keyinteraction/focus/focus.qml b/examples/declarative/keyinteraction/focus/focus.qml index 9cb1fef..935db25 100644 --- a/examples/declarative/keyinteraction/focus/focus.qml +++ b/examples/declarative/keyinteraction/focus/focus.qml @@ -91,7 +91,7 @@ Rectangle { MouseArea { anchors.fill: parent; anchors.margins: -10 - onClicked: window.state = "contextMenuOpen" + onClicked: contextMenu.focus = true } } |