Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration

* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: (29 commits)
  Plugins documentation.
  Fix update issue when an item has an effect and child.
  Fix QDeclarativeTextInput and QGraphicsView in regards of input methods hints.
  Disallow "Qt" as namespace import
  Don't "adjust" the z value of a delegate that has been cached.
  Correctly inherit extension properties
  Autotests
  More QDeclarativeNetworkAccessManagerFactory doc clarification.
  Fix QDeclarativeNetworkAccessManagerFactory docs.
  Don't crash on invalid model remove signal.
  Ensure scheduled layout can occur before testing.
  Fix remaining 4.6 type registrations (to 4.7).
  doc anchor margins vs. anchor (line) state/animation.
  These examples should not be included in this test
  Unify naming of settings / UI to be "Qt Qml Runtime"
  Improved error messages for type resolving, new debug option
  Link to example files from tutorial pages
  Add tutorial for writing QML extensions
  no export in plugin
  Add doc pages for qml examples.
  ...

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();