diff options
author | David Boddie <dboddie@trolltech.com> | 2010-05-20 13:24:30 (GMT) |
---|---|---|
committer | David Boddie <dboddie@trolltech.com> | 2010-05-20 13:24:30 (GMT) |
commit | ba2cc78943678173d21a4339839e63d16fe774a9 (patch) | |
tree | 691ac2916d5daf948cdac07bc4ef19d08f36cabd /examples/declarative/tutorials | |
parent | 8f47373e3795d7ec50387d5f1a771a59567bdaea (diff) | |
parent | ef8cd7f2e68d6d34d70c3a12e82a67ed16b92b72 (diff) | |
download | Qt-ba2cc78943678173d21a4339839e63d16fe774a9.zip Qt-ba2cc78943678173d21a4339839e63d16fe774a9.tar.gz Qt-ba2cc78943678173d21a4339839e63d16fe774a9.tar.bz2 |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7
Diffstat (limited to 'examples/declarative/tutorials')
4 files changed, 11 insertions, 6 deletions
diff --git a/examples/declarative/tutorials/extending/chapter5-plugins/chapter5-plugins.pro b/examples/declarative/tutorials/extending/chapter5-plugins/chapter5-plugins.pro index 7ec68e9..a8fb565 100644 --- a/examples/declarative/tutorials/extending/chapter5-plugins/chapter5-plugins.pro +++ b/examples/declarative/tutorials/extending/chapter5-plugins/chapter5-plugins.pro @@ -13,3 +13,8 @@ SOURCES += musician.cpp \ DESTDIR = lib OBJECTS_DIR = tmp MOC_DIR = tmp + +symbian { + include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri) + TARGET.EPOCALLOWDLLDATA = 1 +} diff --git a/examples/declarative/tutorials/samegame/samegame2/samegame.js b/examples/declarative/tutorials/samegame/samegame2/samegame.js index 0dbe6a6..c749dc1 100644 --- a/examples/declarative/tutorials/samegame/samegame2/samegame.js +++ b/examples/declarative/tutorials/samegame/samegame2/samegame.js @@ -44,7 +44,7 @@ function createBlock(column, row) { var dynamicObject = component.createObject(background); if (dynamicObject == null) { console.log("error creating block"); - console.log(component.errorsString()); + console.log(component.errorString()); return false; } dynamicObject.x = column * blockSize; @@ -54,7 +54,7 @@ function createBlock(column, row) { board[index(column, row)] = dynamicObject; } else { console.log("error loading block component"); - console.log(component.errorsString()); + console.log(component.errorString()); return false; } return true; diff --git a/examples/declarative/tutorials/samegame/samegame3/samegame.js b/examples/declarative/tutorials/samegame/samegame3/samegame.js index 3e97264..df5bdfb 100644 --- a/examples/declarative/tutorials/samegame/samegame3/samegame.js +++ b/examples/declarative/tutorials/samegame/samegame3/samegame.js @@ -41,7 +41,7 @@ function createBlock(column, row) { var dynamicObject = component.createObject(gameCanvas); if (dynamicObject == null) { console.log("error creating block"); - console.log(component.errorsString()); + console.log(component.errorString()); return false; } dynamicObject.type = Math.floor(Math.random() * 3); @@ -52,7 +52,7 @@ function createBlock(column, row) { board[index(column, row)] = dynamicObject; } else { console.log("error loading block component"); - console.log(component.errorsString()); + console.log(component.errorString()); return false; } return true; diff --git a/examples/declarative/tutorials/samegame/samegame4/content/samegame.js b/examples/declarative/tutorials/samegame/samegame4/content/samegame.js index 0505b8d..930a3d8 100755 --- a/examples/declarative/tutorials/samegame/samegame4/content/samegame.js +++ b/examples/declarative/tutorials/samegame/samegame4/content/samegame.js @@ -52,7 +52,7 @@ function createBlock(column, row) { var dynamicObject = component.createObject(gameCanvas); if (dynamicObject == null) { console.log("error creating block"); - console.log(component.errorsString()); + console.log(component.errorString()); return false; } dynamicObject.type = Math.floor(Math.random() * 3); @@ -65,7 +65,7 @@ function createBlock(column, row) { board[index(column, row)] = dynamicObject; } else { console.log("error loading block component"); - console.log(component.errorsString()); + console.log(component.errorString()); return false; } return true; |