diff options
| author | Martin Jones <martin.jones@nokia.com> | 2009-11-30 05:52:09 (GMT) |
|---|---|---|
| committer | Martin Jones <martin.jones@nokia.com> | 2009-11-30 05:52:09 (GMT) |
| commit | c4cd2138ea46f9e7990bd732b63d7322f21a2f38 (patch) | |
| tree | 0a7409383632a29b95ea48087be6935b6b494139 /examples | |
| parent | 541c254ce91ea7dea01081f0b093b902527c3476 (diff) | |
| parent | 68e3cab8a8183a5a88e5be092471a05692e05afe (diff) | |
| download | Qt-c4cd2138ea46f9e7990bd732b63d7322f21a2f38.zip Qt-c4cd2138ea46f9e7990bd732b63d7322f21a2f38.tar.gz Qt-c4cd2138ea46f9e7990bd732b63d7322f21a2f38.tar.bz2 | |
Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Diffstat (limited to 'examples')
3 files changed, 3 insertions, 2 deletions
diff --git a/examples/declarative/listview/dummydata/MyPetsModel.qml b/examples/declarative/listview/dummydata/MyPetsModel.qml index 9a00dca..074fc13 100644 --- a/examples/declarative/listview/dummydata/MyPetsModel.qml +++ b/examples/declarative/listview/dummydata/MyPetsModel.qml @@ -29,7 +29,7 @@ ListModel { size: "Medium" } ListElement { - name: "Whiskers" + name: "Schrödinger" type: "Cat" age: 2 size: "Medium" diff --git a/examples/declarative/tutorials/helloworld/tutorial3.qml b/examples/declarative/tutorials/helloworld/tutorial3.qml index 52c3fe8..0f27f86 100644 --- a/examples/declarative/tutorials/helloworld/tutorial3.qml +++ b/examples/declarative/tutorials/helloworld/tutorial3.qml @@ -29,7 +29,7 @@ Rectangle { from: ""; to: "down"; reversible: true ParallelAnimation { NumberAnimation { matchProperties: "y,rotation"; duration: 500; easing: "easeInOutQuad" } - ColorAnimation { property: "color"; duration: 500 } + ColorAnimation { duration: 500 } } } //![3] diff --git a/examples/declarative/tutorials/samegame/samegame4/content/samegame.js b/examples/declarative/tutorials/samegame/samegame4/content/samegame.js index b833385..2a0d718 100755 --- a/examples/declarative/tutorials/samegame/samegame4/content/samegame.js +++ b/examples/declarative/tutorials/samegame/samegame4/content/samegame.js @@ -238,6 +238,7 @@ function sendHighScore(name) { var postData = "name="+name+"&score="+gameCanvas.score +"&gridSize="+maxX+"x"+maxY +"&time="+Math.floor(timer/1000); postman.open("POST", scoresURL, true); + postman.setRequestHeader("Content-Type", "application/x-www-form-urlencoded"); postman.onreadystatechange = function() { if (postman.readyState == postman.DONE) { dialog.show("Your score has been uploaded."); |