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

4 files changed, 15 insertions, 15 deletions

diff --git a/examples/declarative/dynamic/qml/itemCreation.js b/examples/declarative/dynamic/qml/itemCreation.js
index 98d48a8..3c1b975 100644
--- a/examples/declarative/dynamic/qml/itemCreation.js
+++ b/examples/declarative/dynamic/qml/itemCreation.js
@@ -33,7 +33,7 @@ function loadComponent() {
 
     itemComponent = Qt.createComponent(itemButton.file);
     //console.log(itemButton.file)
-    if(itemComponent.isLoading){
+    if(itemComponent.status == Component.Loading){
         component.statusChanged.connect(finishCreation);
     }else{//Depending on the content, it can be ready or error immediately
         createItem();
@@ -41,7 +41,7 @@ function loadComponent() {
 }
 
 function createItem() {
-    if (itemComponent.isReady && draggedItem == null) {
+    if (itemComponent.status == Component.Ready && draggedItem == null) {
         draggedItem = itemComponent.createObject();
         draggedItem.parent = window;
         draggedItem.image = itemButton.image;
@@ -49,7 +49,7 @@ function createItem() {
         draggedItem.y = yOffset;
         startingZ = draggedItem.z;
         draggedItem.z = 4;//On top
-    } else if (itemComponent.isError) {
+    } else if (itemComponent.status == Component.Error) {
         draggedItem = null;
         console.log("error creating component");
         console.log(component.errorsString());
diff --git a/examples/declarative/tutorials/samegame/samegame2/samegame.js b/examples/declarative/tutorials/samegame/samegame2/samegame.js
index e5c790d..bcfb5b6 100644
--- a/examples/declarative/tutorials/samegame/samegame2/samegame.js
+++ b/examples/declarative/tutorials/samegame/samegame2/samegame.js
@@ -37,10 +37,10 @@ function createBlock(column, row) {
     if (component == null)
         component = Qt.createComponent("Block.qml");
 
-    // Note that if Block.qml was not a local file, component.isReady would be
-    // false and we should wait for the component's statusChanged() signal to
-    // know when the file is downloaded and fully loaded before calling createObject().
-    if (component.isReady) {
+    // Note that if Block.qml was not a local file, component.status would be
+    // Loading and we should wait for the component's statusChanged() signal to
+    // know when the file is downloaded and ready before calling createObject().
+    if (component.status == Component.Ready) {
         var dynamicObject = component.createObject();
         if (dynamicObject == null) {
             console.log("error creating block");
diff --git a/examples/declarative/tutorials/samegame/samegame3/samegame.js b/examples/declarative/tutorials/samegame/samegame3/samegame.js
index da0f76e..4256aee 100644
--- a/examples/declarative/tutorials/samegame/samegame3/samegame.js
+++ b/examples/declarative/tutorials/samegame/samegame3/samegame.js
@@ -34,10 +34,10 @@ function createBlock(column, row) {
     if (component == null)
         component = Qt.createComponent("Block.qml");
 
-    // Note that if Block.qml was not a local file, component.isReady would be
-    // false and we should wait for the component's statusChanged() signal to
-    // know when the file is downloaded and fully loaded before calling createObject().
-    if (component.isReady) {
+    // Note that if Block.qml was not a local file, component.status would be
+    // Loading and we should wait for the component's statusChanged() signal to
+    // know when the file is downloaded and ready before calling createObject().
+    if (component.status == Component.Ready) {
         var dynamicObject = component.createObject();
         if (dynamicObject == null) {
             console.log("error creating block");
diff --git a/examples/declarative/tutorials/samegame/samegame4/content/samegame.js b/examples/declarative/tutorials/samegame/samegame4/content/samegame.js
index 1454f0b..961cd66 100755
--- a/examples/declarative/tutorials/samegame/samegame4/content/samegame.js
+++ b/examples/declarative/tutorials/samegame/samegame4/content/samegame.js
@@ -45,10 +45,10 @@ function createBlock(column, row) {
     if (component == null)
         component = Qt.createComponent("content/BoomBlock.qml");
 
-    // Note that if Block.qml was not a local file, component.isReady would be
-    // false and we should wait for the component's statusChanged() signal to
-    // know when the file is downloaded and fully loaded before calling createObject().
-    if (component.isReady) {
+    // Note that if Block.qml was not a local file, component.status would be
+    // Loading and we should wait for the component's statusChanged() signal to
+    // know when the file is downloaded and ready before calling createObject().
+    if (component.status == Component.Ready) {
         var dynamicObject = component.createObject();
         if (dynamicObject == null) {
             console.log("error creating block");