diff options
| author | Martin Smith <msmith@trolltech.com> | 2010-04-28 08:14:11 (GMT) |
|---|---|---|
| committer | Martin Smith <msmith@trolltech.com> | 2010-04-28 08:14:11 (GMT) |
| commit | 36bd47429312f6d78d620c04bb7e62d34273d310 (patch) | |
| tree | dea54adff0ec870a88d96e7e3bb00b9657175412 /demos | |
| parent | 00ebbeb5c319957d5671130313da3c5485e0f31c (diff) | |
| parent | 2737386ebcb99715d3198a91b5951415c24f99aa (diff) | |
| download | Qt-36bd47429312f6d78d620c04bb7e62d34273d310.zip Qt-36bd47429312f6d78d620c04bb7e62d34273d310.tar.gz Qt-36bd47429312f6d78d620c04bb7e62d34273d310.tar.bz2 | |
Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7
Diffstat (limited to 'demos')
| -rwxr-xr-x | demos/declarative/samegame/SamegameCore/samegame.js | 9 | ||||
| -rw-r--r-- | demos/declarative/snake/content/snake.js | 8 |
2 files changed, 8 insertions, 9 deletions
diff --git a/demos/declarative/samegame/SamegameCore/samegame.js b/demos/declarative/samegame/SamegameCore/samegame.js index aafbfdf..bf99ca3 100755 --- a/demos/declarative/samegame/SamegameCore/samegame.js +++ b/demos/declarative/samegame/SamegameCore/samegame.js @@ -5,7 +5,6 @@ var maxRow = 15; var maxIndex = maxColumn*maxRow; var board = new Array(maxIndex); var blockSrc = "SamegameCore/BoomBlock.qml"; -var scoresURL = "http://qtfx-nokia.trolltech.com.au/samegame/scores.php"; var scoresURL = ""; var gameDuration; var component = Qt.createComponent(blockSrc); @@ -179,8 +178,8 @@ function createBlock(column,row){ if(component.isReady){ var dynamicObject = component.createObject(); if(dynamicObject == null){ - print("error creating block"); - print(component.errorsString()); + console.log("error creating block"); + console.log(component.errorsString()); return false; } dynamicObject.type = Math.floor(Math.random() * 3); @@ -193,8 +192,8 @@ function createBlock(column,row){ dynamicObject.spawned = true; board[index(column,row)] = dynamicObject; }else{ - print("error loading block component"); - print(component.errorsString()); + console.log("error loading block component"); + console.log(component.errorsString()); return false; } return true; diff --git a/demos/declarative/snake/content/snake.js b/demos/declarative/snake/content/snake.js index 2457fbd..02f9757 100644 --- a/demos/declarative/snake/content/snake.js +++ b/demos/declarative/snake/content/snake.js @@ -54,9 +54,9 @@ function startNewGame() } else { if(linkComponent.isReady == false){ if(linkComponent.isError == true) - print(linkComponent.errorsString()); + console.log(linkComponent.errorsString()); else - print("Still loading linkComponent"); + console.log("Still loading linkComponent"); continue;//TODO: Better error handling? } var link = linkComponent.createObject(); @@ -295,9 +295,9 @@ function createCookie(value) { if(cookieComponent.isReady == false){ if(cookieComponent.isError == true) - print(cookieComponent.errorsString()); + console.log(cookieComponent.errorsString()); else - print("Still loading cookieComponent"); + console.log("Still loading cookieComponent"); return;//TODO: Better error handling? } cookie = cookieComponent.createObject(); |