summaryrefslogtreecommitdiffstats
path: root/src/declarative/qml/qmlcomponent.cpp
diff options
context:
space:
mode:
authorMartin Jones <martin.jones@nokia.com>2009-09-09 05:14:21 (GMT)
committerMartin Jones <martin.jones@nokia.com>2009-09-09 05:14:21 (GMT)
commit6878a0b7c507d21366cacee0a09bafeb81726d82 (patch)
tree457c32d1ec3044efe99c5950bce1cca6db41e41a /src/declarative/qml/qmlcomponent.cpp
parent7731e5f7d33d3ec251299c7651e777d7e0054573 (diff)
downloadQt-6878a0b7c507d21366cacee0a09bafeb81726d82.zip
Qt-6878a0b7c507d21366cacee0a09bafeb81726d82.tar.gz
Qt-6878a0b7c507d21366cacee0a09bafeb81726d82.tar.bz2
Move ComponentInstance functionality into Loader
Diffstat (limited to 'src/declarative/qml/qmlcomponent.cpp')
-rw-r--r--src/declarative/qml/qmlcomponent.cpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/declarative/qml/qmlcomponent.cpp b/src/declarative/qml/qmlcomponent.cpp
index f291ac0..1c35606 100644
--- a/src/declarative/qml/qmlcomponent.cpp
+++ b/src/declarative/qml/qmlcomponent.cpp
@@ -91,8 +91,8 @@ Item {
height: 10
}
}
- ComponentInstance { component: RedSquare }
- ComponentInstance { component: RedSquare; x: 20 }
+ Loader { sourceComponent: RedSquare }
+ Loader { sourceComponent: RedSquare; x: 20 }
}
\endqml
*/
@@ -328,6 +328,7 @@ QmlComponent::QmlComponent(QmlEngine *engine, QmlCompiledData *cc, int start, in
d->start = start;
d->count = count;
d->url = cc->url;
+ d->progress = 1.0;
}
/*!