summaryrefslogtreecommitdiffstats
path: root/examples
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2011-02-18 13:32:56 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2011-02-18 13:32:56 (GMT)
commit5981173f0451736bf2b53e7bf36dbbd02d8f3904 (patch)
tree221c1fa02b03c939ce0023653f96c45145b10a85 /examples
parent177131d06d0d7a39d5de210ac8ed5dff9ca4999f (diff)
parent9e063f7e4790cc15b279a44807ff59c620d53ce6 (diff)
downloadQt-5981173f0451736bf2b53e7bf36dbbd02d8f3904.zip
Qt-5981173f0451736bf2b53e7bf36dbbd02d8f3904.tar.gz
Qt-5981173f0451736bf2b53e7bf36dbbd02d8f3904.tar.bz2
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Fix TextEdit auto test failure on windows. Fix FocusScope example. Fix compilation on old Symbian platforms Export symbols from qtestlib required for QtQuickTest Allow MouseArea to prevent mouse grab begin stolen by Flickable. Fix QTBUG-17008 XmlListModel blocks Windows system events Fix TextInput, TextEdit auto test failure on windows and mac. QDeclarativeDebug: Fix crash when serializing list of QObjects Update the input context when the pre-edit cursor position changes.
Diffstat (limited to 'examples')
-rw-r--r--examples/declarative/keyinteraction/focus/focus.qml2
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
}
}