diff options
| author | Simon Hausmann <simon.hausmann@theqtcompany.com> | 2014-12-09 15:09:20 +0100 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@theqtcompany.com> | 2014-12-09 15:09:26 +0100 |
| commit | ff466a1881435f927f5df9ce1e5eac07d5591904 (patch) | |
| tree | 760e068743e6a8e1cc4ec63bb2f8e7dcef88b3e2 /examples | |
| parent | e04822f3c2a6b69b7d75e2039256aa2433c59dd2 (diff) | |
| parent | 4a3f6e58b591f2fe2204f7cbc1efc8abb0aade74 (diff) | |
Merge remote-tracking branch 'origin/5.4' into dev
Conflicts:
src/qml/jsruntime/qv4arraydata.cpp
src/qml/jsruntime/qv4context_p.h
src/qml/jsruntime/qv4globalobject.cpp
src/qml/jsruntime/qv4internalclass.cpp
src/quick/items/qquicktext_p.h
src/quick/items/qquicktextedit_p.h
src/quick/items/qquicktextinput_p.h
Change-Id: If07e483e03197cb997ef47a9c647a479cdb09f4c
Diffstat (limited to 'examples')
| -rw-r--r-- | examples/qmltest/qmltest/tst_basic.qml | 4 | ||||
| -rw-r--r-- | examples/qmltest/qmltest/tst_item.qml | 4 | ||||
| -rw-r--r--[-rwxr-xr-x] | examples/quick/demos/samegame/content/samegame.js | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | examples/quick/particles/images/backgroundLeaves.jpg | bin | 78665 -> 78665 bytes | |||
| -rw-r--r-- | examples/quick/touchinteraction/flickable/content/Panel.qml | 2 | ||||
| -rw-r--r--[-rwxr-xr-x] | examples/quick/tutorials/samegame/samegame4/highscores/score_data.xml | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | examples/quick/tutorials/samegame/samegame4/highscores/score_style.xsl | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | examples/quick/tutorials/samegame/samegame4/highscores/scores.php | 0 |
8 files changed, 5 insertions, 5 deletions
diff --git a/examples/qmltest/qmltest/tst_basic.qml b/examples/qmltest/qmltest/tst_basic.qml index ba5ebe935a..1d9efbab61 100644 --- a/examples/qmltest/qmltest/tst_basic.qml +++ b/examples/qmltest/qmltest/tst_basic.qml @@ -31,8 +31,8 @@ ** ****************************************************************************/ -import QtQuick 2.0 -import QtTest 1.0 +import QtQuick 2.4 +import QtTest 1.1 TestCase { name: "BasicTests" diff --git a/examples/qmltest/qmltest/tst_item.qml b/examples/qmltest/qmltest/tst_item.qml index 69e2b83a00..966d7e1bfe 100644 --- a/examples/qmltest/qmltest/tst_item.qml +++ b/examples/qmltest/qmltest/tst_item.qml @@ -31,8 +31,8 @@ ** ****************************************************************************/ -import QtQuick 2.0 -import QtTest 1.0 +import QtQuick 2.4 +import QtTest 1.1 Rectangle { id: foo 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 Binary files differindex 08be16751d..08be16751d 100755..100644 --- a/examples/quick/particles/images/backgroundLeaves.jpg +++ b/examples/quick/particles/images/backgroundLeaves.jpg 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 |
