diff options
| author | Alan Alpert <alan.alpert@nokia.com> | 2009-10-29 03:52:36 (GMT) |
|---|---|---|
| committer | Alan Alpert <alan.alpert@nokia.com> | 2009-10-29 04:06:09 (GMT) |
| commit | 220eea1b5a978cf62e27878e7d9b2e1f4d10e91e (patch) | |
| tree | 0cdb8ba932cedd3b2f0f1b45b92c4c095a36862c /src/declarative/qml/qmlcomponent_p.h | |
| parent | bfbded95056d43a65b2c9ef1fa90bfd40adc6472 (diff) | |
| download | Qt-220eea1b5a978cf62e27878e7d9b2e1f4d10e91e.zip Qt-220eea1b5a978cf62e27878e7d9b2e1f4d10e91e.tar.gz Qt-220eea1b5a978cf62e27878e7d9b2e1f4d10e91e.tar.bz2 | |
Merge QmlComponentJS into QmlComponent
createComponent() and Component{} are now the same, and so Component{}s
can now be passed around for use in script.
Also this commit fixes the minor bug QT-2386
Diffstat (limited to 'src/declarative/qml/qmlcomponent_p.h')
| -rw-r--r-- | src/declarative/qml/qmlcomponent_p.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/declarative/qml/qmlcomponent_p.h b/src/declarative/qml/qmlcomponent_p.h index f90502f..cd886d5 100644 --- a/src/declarative/qml/qmlcomponent_p.h +++ b/src/declarative/qml/qmlcomponent_p.h @@ -76,7 +76,7 @@ class QmlComponentPrivate : public QObjectPrivate Q_DECLARE_PUBLIC(QmlComponent) public: - QmlComponentPrivate() : typeData(0), progress(0.), start(-1), count(-1), cc(0), componentAttacheds(0), completePending(false), engine(0) {} + QmlComponentPrivate() : typeData(0), progress(0.), start(-1), count(-1), cc(0), componentAttacheds(0), completePending(false), engine(0), creationContext(0) {} QObject *create(QmlContext *context, const QBitField &); @@ -104,6 +104,7 @@ public: bool completePending; QmlEngine *engine; + QmlContext *creationContext; void clear(); |