diff options
| author | Warwick Allison <warwick.allison@nokia.com> | 2009-11-29 23:54:55 (GMT) |
|---|---|---|
| committer | Warwick Allison <warwick.allison@nokia.com> | 2009-11-29 23:54:55 (GMT) |
| commit | e30409e0d93755bea4d18bcff4b9b86602c6dd52 (patch) | |
| tree | 00a02590e4c2ed7cfe478c294935b06c11aa4829 /examples | |
| parent | 15145a3b6d675c268b6262d11d390eaf9fc25fee (diff) | |
| parent | dc59b792119241988cdfe9f31d3aea55dcd5e8fe (diff) | |
| download | Qt-e30409e0d93755bea4d18bcff4b9b86602c6dd52.zip Qt-e30409e0d93755bea4d18bcff4b9b86602c6dd52.tar.gz Qt-e30409e0d93755bea4d18bcff4b9b86602c6dd52.tar.bz2 | |
Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Diffstat (limited to 'examples')
| -rw-r--r-- | examples/declarative/loader/loader.pro | 2 | ||||
| -rw-r--r-- | examples/declarative/tutorials/helloworld/tutorial3.qml | 2 | ||||
| -rwxr-xr-x | examples/declarative/tutorials/samegame/samegame4/content/samegame.js | 1 |
3 files changed, 3 insertions, 2 deletions
diff --git a/examples/declarative/loader/loader.pro b/examples/declarative/loader/loader.pro index 0ad71f7..edd6267 100644 --- a/examples/declarative/loader/loader.pro +++ b/examples/declarative/loader/loader.pro @@ -12,7 +12,7 @@ INSTALLS += target sources symbian { # TARGET.UID3 = include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri) - TARGET.EPOCHEAPSIZE = 100000 20000000 + TARGET.EPOCHEAPSIZE = 0x20000 0x2000000 HEADERS += $$QT_SOURCE_TREE/examples/network/qftp/sym_iap_util.h LIBS += -lesock -lconnmon -linsock TARGET.CAPABILITY = NetworkServices 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."); |