diff options
author | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2016-06-27 11:55:33 +0200 |
---|---|---|
committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2016-06-27 15:40:17 +0000 |
commit | 97212616d5a7fc68d9ee97015751326ec2908287 (patch) | |
tree | ada8f172265b097406489672cd29cda1029f4642 /src/quickwidgets | |
parent | c9d4c8ed97694defea78184a80874764ebedfda1 (diff) |
Lazy create QmlEngine on accessing rootContext
A common usecase appears to be to set variables in the rootContext
before loading a url in a QQuickWidget. We there need to ensure there
is a QmlEngine to set variables on when this is attempted.
Change-Id: I07aff2104313eeb3fab902ea3c6043c3c82c50f7
Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>
Diffstat (limited to 'src/quickwidgets')
-rw-r--r-- | src/quickwidgets/qquickwidget.cpp | 12 | ||||
-rw-r--r-- | src/quickwidgets/qquickwidget_p.h | 4 |
2 files changed, 9 insertions, 7 deletions
diff --git a/src/quickwidgets/qquickwidget.cpp b/src/quickwidgets/qquickwidget.cpp index 05097b3ce2..49e7affa31 100644 --- a/src/quickwidgets/qquickwidget.cpp +++ b/src/quickwidgets/qquickwidget.cpp @@ -109,13 +109,13 @@ void QQuickWidgetPrivate::init(QQmlEngine* e) QObject::connect(renderControl, SIGNAL(sceneChanged()), q, SLOT(triggerUpdate())); } -void QQuickWidgetPrivate::ensureEngine() +void QQuickWidgetPrivate::ensureEngine() const { - Q_Q(QQuickWidget); + Q_Q(const QQuickWidget); if (!engine.isNull()) return; - engine = new QQmlEngine(q); + engine = new QQmlEngine(const_cast<QQuickWidget*>(q)); engine.data()->setIncubationController(offscreenWindow->incubationController()); } @@ -493,7 +493,8 @@ QUrl QQuickWidget::source() const QQmlEngine* QQuickWidget::engine() const { Q_D(const QQuickWidget); - return d->engine ? const_cast<QQmlEngine *>(d->engine.data()) : 0; + d->ensureEngine(); + return const_cast<QQmlEngine *>(d->engine.data()); } /*! @@ -506,7 +507,8 @@ QQmlEngine* QQuickWidget::engine() const QQmlContext* QQuickWidget::rootContext() const { Q_D(const QQuickWidget); - return d->engine ? d->engine.data()->rootContext() : 0; + d->ensureEngine(); + return d->engine.data()->rootContext(); } /*! diff --git a/src/quickwidgets/qquickwidget_p.h b/src/quickwidgets/qquickwidget_p.h index f0e1f848e3..b01d634fcd 100644 --- a/src/quickwidgets/qquickwidget_p.h +++ b/src/quickwidgets/qquickwidget_p.h @@ -105,7 +105,7 @@ public: QImage grabFramebuffer() Q_DECL_OVERRIDE; void init(QQmlEngine* e = 0); - void ensureEngine(); + void ensureEngine() const; void handleWindowChange(); void invalidateRenderControl(); @@ -115,7 +115,7 @@ public: QUrl source; - QPointer<QQmlEngine> engine; + mutable QPointer<QQmlEngine> engine; QQmlComponent *component; QBasicTimer resizetimer; QQuickWindow *offscreenWindow; |