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

2 files changed, 5 insertions, 5 deletions

diff --git a/demos/declarative/samegame/SamegameCore/samegame.js b/demos/declarative/samegame/SamegameCore/samegame.js
index bf99ca3..cc0a70d 100755
--- a/demos/declarative/samegame/SamegameCore/samegame.js
+++ b/demos/declarative/samegame/SamegameCore/samegame.js
@@ -175,7 +175,7 @@ function createBlock(column,row){
     // only work if the block QML is a local file. Otherwise the component will
     // not be ready immediately. There is a statusChanged signal on the
     // component you could use if you want to wait to load remote files.
-    if(component.isReady){
+    if(component.status == Component.Ready){
         var dynamicObject = component.createObject();
         if(dynamicObject == null){
             console.log("error creating block");
diff --git a/demos/declarative/snake/content/snake.js b/demos/declarative/snake/content/snake.js
index 02f9757..102bd87 100644
--- a/demos/declarative/snake/content/snake.js
+++ b/demos/declarative/snake/content/snake.js
@@ -52,8 +52,8 @@ function startNewGame()
             link.spawned = false;
             link.dying = false;
         } else {
-            if(linkComponent.isReady == false){
-                if(linkComponent.isError == true)
+            if(linkComponent.status != Component.Ready) {
+                if(linkComponent.status == Component.Error) 
                     console.log(linkComponent.errorsString());
                 else
                     console.log("Still loading linkComponent");
@@ -293,8 +293,8 @@ function createCookie(value) {
         }
     }
 
-    if(cookieComponent.isReady == false){
-        if(cookieComponent.isError == true)
+    if(cookieComponent.status != Component.Ready) {
+        if(cookieComponent.status == Component.Error)
             console.log(cookieComponent.errorsString());
         else
             console.log("Still loading cookieComponent");