summaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
authorMartin Jones <martin.jones@nokia.com>2010-04-29 06:44:46 (GMT)
committerMartin Jones <martin.jones@nokia.com>2010-04-29 06:44:46 (GMT)
commit20290c189bf00fc457ec7d1f82708a8df83adbc5 (patch)
treedc31778364b114509cf3fa82c7f51a6fff864c29 /doc
parent6b5d58554cdc1c18c73bfb39e736a3621959ca4c (diff)
parent69efa1c869694666c66375179b43e2569cf2772b (diff)
downloadQt-20290c189bf00fc457ec7d1f82708a8df83adbc5.zip
Qt-20290c189bf00fc457ec7d1f82708a8df83adbc5.tar.gz
Qt-20290c189bf00fc457ec7d1f82708a8df83adbc5.tar.bz2
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7
Diffstat (limited to 'doc')
-rw-r--r--doc/src/snippets/declarative/componentCreation.js6
1 files changed, 3 insertions, 3 deletions
diff --git a/doc/src/snippets/declarative/componentCreation.js b/doc/src/snippets/declarative/componentCreation.js
index be3e4d6..814545e 100644
--- a/doc/src/snippets/declarative/componentCreation.js
+++ b/doc/src/snippets/declarative/componentCreation.js
@@ -3,7 +3,7 @@ var component;
var sprite;
function finishCreation() {
- if (component.isReady) {
+ if (component.status == Component.Ready) {
sprite = component.createObject();
if (sprite == null) {
// Error Handling
@@ -13,7 +13,7 @@ function finishCreation() {
sprite.y = 100;
// ...
}
- } else if (component.isError()) {
+ } else if (component.status == Component.Error) {
// Error Handling
console.log("Error loading component:", component.errorsString());
}
@@ -26,7 +26,7 @@ function createSpriteObjects() {
//![2]
component = Qt.createComponent("Sprite.qml");
- if (component.isReady)
+ if (component.status == Component.Ready)
finishCreation();
else
component.statusChanged.connect(finishCreation);