diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-09-05 09:01:22 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-09-05 09:31:34 +0200 |
| commit | 2795ac5d5930fa28ea329529c0dd2e515b361531 (patch) | |
| tree | 8dd01197f5b71e1eb8e3612b0119764623325803 /src/quick/doc/snippets/qml | |
| parent | 8f93d3627a9b76bf77896501129990e33a77f32c (diff) | |
| parent | 6ff0e9a65657e8c51a37e63efe8169bb7e3050cc (diff) | |
Merge remote-tracking branch 'origin/5.9' into 5.10
Conflicts:
src/quick/items/qquickwindow.cpp
src/quick/scenegraph/qsgrenderloop.cpp
Change-Id: Idd7106995b5545fcac869e9056a365ef9edb36ca
Diffstat (limited to 'src/quick/doc/snippets/qml')
| -rw-r--r-- | src/quick/doc/snippets/qml/loader/KeyReader.qml | 2 | ||||
| -rw-r--r-- | src/quick/doc/snippets/qml/loader/focus.qml | 7 |
2 files changed, 6 insertions, 3 deletions
diff --git a/src/quick/doc/snippets/qml/loader/KeyReader.qml b/src/quick/doc/snippets/qml/loader/KeyReader.qml index 41eb208dd0..56604319e0 100644 --- a/src/quick/doc/snippets/qml/loader/KeyReader.qml +++ b/src/quick/doc/snippets/qml/loader/KeyReader.qml @@ -43,7 +43,7 @@ Item { Item { focus: true Keys.onPressed: { - console.log("Loaded item captured:", + console.log("KeyReader captured:", event.text); event.accepted = true; } diff --git a/src/quick/doc/snippets/qml/loader/focus.qml b/src/quick/doc/snippets/qml/loader/focus.qml index 5634a48ad1..f3509021f1 100644 --- a/src/quick/doc/snippets/qml/loader/focus.qml +++ b/src/quick/doc/snippets/qml/loader/focus.qml @@ -49,11 +49,14 @@ Rectangle { MouseArea { anchors.fill: parent - onClicked: loader.source = "KeyReader.qml" + onClicked: { + loader.source = "KeyReader.qml" + } } Keys.onPressed: { - console.log("Captured:", event.text); + console.log("Captured:", + event.text); } } //![0] |