diff options
| author | Simon Hausmann <simon.hausmann@theqtcompany.com> | 2016-06-01 12:22:11 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@qt.io> | 2016-06-01 17:33:50 +0000 |
| commit | 1f3f6d3e7d81dc11658a46003e86e921edb35bdf (patch) | |
| tree | f16e5535451a755d0a550839de5f19a8d2fb6b6c /src/qml/qml/qqmlincubator_p.h | |
| parent | 3b14f29b8e5b889c7682eaca3e750493a05bcdb8 (diff) | |
Remove QQmlCompiledData in favor of QV4::CompiledData::CompilationUnit
QQmlCompiledData used to contain the binary data for instantiating QML types in
the QML VME. Nowadays the QML type compiler as well as the JavaScript compiler
create a QV4::CompiledData::CompilationUnit.
Change-Id: I155f62a5ecfb55a3fe230520231b6d8fd5b28ac9
Reviewed-by: Robin Burchell <robin.burchell@viroteck.net>
Diffstat (limited to 'src/qml/qml/qqmlincubator_p.h')
| -rw-r--r-- | src/qml/qml/qqmlincubator_p.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/qml/qml/qqmlincubator_p.h b/src/qml/qml/qqmlincubator_p.h index 974a353f77..7c6bc15404 100644 --- a/src/qml/qml/qqmlincubator_p.h +++ b/src/qml/qml/qqmlincubator_p.h @@ -59,7 +59,6 @@ QT_BEGIN_NAMESPACE -class QQmlCompiledData; class QQmlIncubator; class QQmlIncubatorPrivate : public QQmlEnginePrivate::Incubator { @@ -86,7 +85,7 @@ public: QPointer<QObject> result; QQmlGuardedContextData rootContext; QQmlEnginePrivate *enginePriv; - QQmlCompiledData *compiledData; + QV4::CompiledData::CompilationUnit *compilationUnit; QScopedPointer<QQmlObjectCreator> creator; int subComponentToCreate; QQmlVMEGuard vmeGuard; |