diff options
| author | Michael Brasser <michael.brasser@nokia.com> | 2009-04-23 01:50:48 (GMT) |
|---|---|---|
| committer | Michael Brasser <michael.brasser@nokia.com> | 2009-04-23 01:50:48 (GMT) |
| commit | 28cec90fd8740f1d47010d99699f86ac014e9926 (patch) | |
| tree | d3ff8dd0eec3bf5c6536960650490cb4cc382396 /src/declarative/qml/qmlcomponent_p.h | |
| parent | 0e8b82bc7b9b0d88e8cc4a4d293851795d35950a (diff) | |
| download | Qt-28cec90fd8740f1d47010d99699f86ac014e9926.zip Qt-28cec90fd8740f1d47010d99699f86ac014e9926.tar.gz Qt-28cec90fd8740f1d47010d99699f86ac014e9926.tar.bz2 | |
Merge in changes to old kinetic-dui branch.
Diffstat (limited to 'src/declarative/qml/qmlcomponent_p.h')
| -rw-r--r-- | src/declarative/qml/qmlcomponent_p.h | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/src/declarative/qml/qmlcomponent_p.h b/src/declarative/qml/qmlcomponent_p.h index e97ec67..8074775 100644 --- a/src/declarative/qml/qmlcomponent_p.h +++ b/src/declarative/qml/qmlcomponent_p.h @@ -63,12 +63,13 @@ class QmlComponentPrivate : public QObjectPrivate public: QmlComponentPrivate() : typeData(0), start(-1), count(-1), cc(0), completePending(false), engine(0) {} - QmlCompositeTypeManager::TypeData *typeData; + QmlCompositeTypeData *typeData; void typeDataReady(); - void fromTypeData(QmlCompositeTypeManager::TypeData *data); + void fromTypeData(QmlCompositeTypeData *data); - QString name; + QString errorDescription; + QUrl url; int start; int count; @@ -78,6 +79,8 @@ public: bool completePending; QmlEngine *engine; + + void clear(); }; #endif // QMLCOMPONENT_P_H |