diff options
author | Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org> | 2020-03-23 20:34:14 +0100 |
---|---|---|
committer | Simon Hausmann <simon.hausmann@qt.io> | 2020-03-23 21:43:17 +0100 |
commit | 468a244e160096a27ce4c47a6a0cc7c8da6163fd (patch) | |
tree | cb977a04a7163ecabed5f255507cbd6a2b26fbf9 /src/quicktemplates2/qquickdeferredexecute.cpp | |
parent | 67792feba0bc39cd79d789a45978436b09fd4adf (diff) |
Update dependencies on 'dev' in qt/qtquickcontrols2
Fix build after internal QtQml API changes.
Change-Id: Iaeafb84f5f2d9c60b54659f27e7baa448a858c4a
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Diffstat (limited to 'src/quicktemplates2/qquickdeferredexecute.cpp')
-rw-r--r-- | src/quicktemplates2/qquickdeferredexecute.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/quicktemplates2/qquickdeferredexecute.cpp b/src/quicktemplates2/qquickdeferredexecute.cpp index d56131e4de..5f2e3c5586 100644 --- a/src/quicktemplates2/qquickdeferredexecute.cpp +++ b/src/quicktemplates2/qquickdeferredexecute.cpp @@ -85,7 +85,7 @@ static bool beginDeferred(QQmlEnginePrivate *enginePriv, const QQmlProperty &pro state->completePending = true; QQmlContextData *creationContext = nullptr; - state->creator.reset(new QQmlObjectCreator(deferData->context->parent, deferData->compilationUnit, creationContext)); + state->creator.reset(new QQmlObjectCreator(deferData->context->parent(), deferData->compilationUnit, creationContext)); enginePriv->inProgressCreations++; @@ -123,7 +123,7 @@ void beginDeferred(QObject *object, const QString &property) { QQmlData *data = QQmlData::get(object); if (data && !data->deferredData.isEmpty() && !data->wasDeleted(object)) { - QQmlEnginePrivate *ep = QQmlEnginePrivate::get(data->context->engine); + QQmlEnginePrivate *ep = QQmlEnginePrivate::get(data->context->engine()); QQmlComponentPrivate::DeferredState *state = new QQmlComponentPrivate::DeferredState; if (beginDeferred(ep, QQmlProperty(object, property), state)) @@ -148,7 +148,7 @@ void completeDeferred(QObject *object, const QString &property) QQmlData *data = QQmlData::get(object); QQmlComponentPrivate::DeferredState *state = deferredStates()->take(qHash(object, property)); if (data && state && !data->wasDeleted(object)) { - QQmlEnginePrivate *ep = QQmlEnginePrivate::get(data->context->engine); + QQmlEnginePrivate *ep = QQmlEnginePrivate::get(data->context->engine()); QQmlComponentPrivate::completeDeferred(ep, state); } delete state; |