diff options
author | J-P Nurmi <jpnurmi@qt.io> | 2017-04-21 08:45:13 +0300 |
---|---|---|
committer | J-P Nurmi <jpnurmi@qt.io> | 2017-04-21 15:15:29 +0000 |
commit | 8dc1ddc14cbd146ad14f66c09a449afaad9f4885 (patch) | |
tree | 9210e542072f2c3949bcc09b3c5c1b36fd4febbb /src/quicktemplates2/qquickapplicationwindow.cpp | |
parent | 20d1bdc650dfcaa1c84d297f412fe7c836972990 (diff) |
Fix QQuickApplicationWindow::isComponentComplete()
It has to default to true to ensure that a QQuickApplicationWindow
instantiated in C++ is not stuck to false forever. When instantiated
by the QML engine, it is set to false during the QML component
initialization phase from classBegin() to componentComple().
Change-Id: Ieba2bbfb8fc0296b8cb28df91b12bcc55dd31bf4
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
Diffstat (limited to 'src/quicktemplates2/qquickapplicationwindow.cpp')
-rw-r--r-- | src/quicktemplates2/qquickapplicationwindow.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/quicktemplates2/qquickapplicationwindow.cpp b/src/quicktemplates2/qquickapplicationwindow.cpp index a92900a5..0cd78502 100644 --- a/src/quicktemplates2/qquickapplicationwindow.cpp +++ b/src/quicktemplates2/qquickapplicationwindow.cpp @@ -138,7 +138,7 @@ class QQuickApplicationWindowPrivate : public QQuickItemChangeListener public: QQuickApplicationWindowPrivate() - : complete(false), + : complete(true), background(nullptr), contentItem(nullptr), header(nullptr), @@ -693,6 +693,7 @@ bool QQuickApplicationWindow::isComponentComplete() const void QQuickApplicationWindow::classBegin() { Q_D(QQuickApplicationWindow); + d->complete = false; QQuickWindowQmlImpl::classBegin(); d->resolveFont(); } |