aboutsummaryrefslogtreecommitdiffstats
path: root/examples/quick
diff options
context:
space:
mode:
Diffstat (limited to 'examples/quick')
-rw-r--r--[-rwxr-xr-x]examples/quick/demos/samegame/content/samegame.js0
-rw-r--r--[-rwxr-xr-x]examples/quick/particles/images/backgroundLeaves.jpgbin78665 -> 78665 bytes
-rw-r--r--examples/quick/touchinteraction/flickable/content/Panel.qml2
-rw-r--r--[-rwxr-xr-x]examples/quick/tutorials/samegame/samegame4/highscores/score_data.xml0
-rw-r--r--[-rwxr-xr-x]examples/quick/tutorials/samegame/samegame4/highscores/score_style.xsl0
-rw-r--r--[-rwxr-xr-x]examples/quick/tutorials/samegame/samegame4/highscores/scores.php0
6 files changed, 1 insertions, 1 deletions
diff --git a/examples/quick/demos/samegame/content/samegame.js b/examples/quick/demos/samegame/content/samegame.js
index 99154320ca..99154320ca 100755..100644
--- a/examples/quick/demos/samegame/content/samegame.js
+++ b/examples/quick/demos/samegame/content/samegame.js
diff --git a/examples/quick/particles/images/backgroundLeaves.jpg b/examples/quick/particles/images/backgroundLeaves.jpg
index 08be16751d..08be16751d 100755..100644
--- a/examples/quick/particles/images/backgroundLeaves.jpg
+++ b/examples/quick/particles/images/backgroundLeaves.jpg
Binary files differ
diff --git a/examples/quick/touchinteraction/flickable/content/Panel.qml b/examples/quick/touchinteraction/flickable/content/Panel.qml
index a144c347e1..b2926f8098 100644
--- a/examples/quick/touchinteraction/flickable/content/Panel.qml
+++ b/examples/quick/touchinteraction/flickable/content/Panel.qml
@@ -116,7 +116,7 @@ Component {
drag.maximumY: page.height - 80
drag.minimumX: 100
drag.maximumX: page.width - 140
- onClicked: { myText.focus = true; Qt.inputMethod.show(); }
+ onClicked: myText.forceActiveFocus()
}
}
}
diff --git a/examples/quick/tutorials/samegame/samegame4/highscores/score_data.xml b/examples/quick/tutorials/samegame/samegame4/highscores/score_data.xml
index c3fd90d9cf..c3fd90d9cf 100755..100644
--- a/examples/quick/tutorials/samegame/samegame4/highscores/score_data.xml
+++ b/examples/quick/tutorials/samegame/samegame4/highscores/score_data.xml
diff --git a/examples/quick/tutorials/samegame/samegame4/highscores/score_style.xsl b/examples/quick/tutorials/samegame/samegame4/highscores/score_style.xsl
index 670354c965..670354c965 100755..100644
--- a/examples/quick/tutorials/samegame/samegame4/highscores/score_style.xsl
+++ b/examples/quick/tutorials/samegame/samegame4/highscores/score_style.xsl
diff --git a/examples/quick/tutorials/samegame/samegame4/highscores/scores.php b/examples/quick/tutorials/samegame/samegame4/highscores/scores.php
index 86e4187acd..86e4187acd 100755..100644
--- a/examples/quick/tutorials/samegame/samegame4/highscores/scores.php
+++ b/examples/quick/tutorials/samegame/samegame4/highscores/scores.php