diff options
| author | Martin Jones <martin.jones@nokia.com> | 2011-10-07 16:20:39 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2011-10-10 10:23:17 +0200 |
| commit | 9da11998e8f9b896daf64c2663e06caecd9491d8 (patch) | |
| tree | 17c58784f3d239d9dec0e10ae745d0f6931f6eec /src/declarative/qml/qdeclarativecomponent_p.h | |
| parent | b8ccc462e88a51834c2623697c1caa3dd1aa35ec (diff) | |
Add "asynchronous" property to Loader.
Use an incubator to perform non-blocking instantiation of components.
Change-Id: I589bfc8ba7bf3368dc44fab3a82afb7e0d66032c
Fixes: QTBUG-21791
Reviewed-on: http://codereview.qt-project.org/6216
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Aaron Kennedy <aaron.kennedy@nokia.com>
Diffstat (limited to 'src/declarative/qml/qdeclarativecomponent_p.h')
| -rw-r--r-- | src/declarative/qml/qdeclarativecomponent_p.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/declarative/qml/qdeclarativecomponent_p.h b/src/declarative/qml/qdeclarativecomponent_p.h index 7e6f9c2d30..bbbf8bdfb7 100644 --- a/src/declarative/qml/qdeclarativecomponent_p.h +++ b/src/declarative/qml/qdeclarativecomponent_p.h @@ -87,7 +87,7 @@ public: QObject *beginCreate(QDeclarativeContextData *); void completeCreate(); - QObject *completeCreateObjectWithInitialProperties(v8::Handle<v8::Object> qmlGlobal, v8::Handle<v8::Object> valuemap, QObject *toCreate); + void initializeObjectWithInitialProperties(v8::Handle<v8::Object> qmlGlobal, v8::Handle<v8::Object> valuemap, QObject *toCreate); QDeclarativeTypeData *typeData; virtual void typeDataReady(QDeclarativeTypeData *); |