diff options
author | Simon Hausmann <simon.hausmann@qt.io> | 2017-08-23 13:48:07 +0200 |
---|---|---|
committer | Simon Hausmann <simon.hausmann@qt.io> | 2017-08-23 13:48:29 +0200 |
commit | 51763b1b191c0839ea05c75855b9e09b65b80546 (patch) | |
tree | 113c4b4328ddecd07c8cff2ac19cea6f2aec0ba2 /src/qml/qml/qqmlobjectcreator_p.h | |
parent | 2b7b24a0e039a18db8ab23475fbab44718f758a2 (diff) | |
parent | 363189a3d351ace484180ede0f2f6c4ed04f8401 (diff) |
Merge remote-tracking branch 'origin/5.9' into dev
Conflicts:
tests/auto/qml/debugger/qqmlenginedebuginspectorintegrationtest/tst_qqmlenginedebuginspectorintegration.cpp
Change-Id: I31375151eb239f348bec988d2d0506c2b4d9604c
Diffstat (limited to 'src/qml/qml/qqmlobjectcreator_p.h')
-rw-r--r-- | src/qml/qml/qqmlobjectcreator_p.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/qml/qml/qqmlobjectcreator_p.h b/src/qml/qml/qqmlobjectcreator_p.h index 45c14f0963..35bf96db4e 100644 --- a/src/qml/qml/qqmlobjectcreator_p.h +++ b/src/qml/qml/qqmlobjectcreator_p.h @@ -65,6 +65,7 @@ QT_BEGIN_NAMESPACE class QQmlAbstractBinding; struct QQmlTypeCompiler; class QQmlInstantiationInterrupt; +class QQmlIncubatorPrivate; struct QQmlObjectCreatorSharedState : public QSharedData { @@ -84,7 +85,7 @@ class QQmlObjectCreator { Q_DECLARE_TR_FUNCTIONS(QQmlObjectCreator) public: - QQmlObjectCreator(QQmlContextData *parentContext, QV4::CompiledData::CompilationUnit *compilationUnit, QQmlContextData *creationContext, void *activeVMEDataForRootContext = 0); + QQmlObjectCreator(QQmlContextData *parentContext, QV4::CompiledData::CompilationUnit *compilationUnit, QQmlContextData *creationContext, QQmlIncubatorPrivate *incubator = 0); ~QQmlObjectCreator(); QObject *create(int subComponentIndex = -1, QObject *parent = 0, QQmlInstantiationInterrupt *interrupt = 0); @@ -143,7 +144,7 @@ private: const QQmlPropertyCacheVector *propertyCaches; QExplicitlySharedDataPointer<QQmlObjectCreatorSharedState> sharedState; bool topLevelCreator; - void *activeVMEDataForRootContext; + QQmlIncubatorPrivate *incubator; QObject *_qobject; QObject *_scopeObject; |