diff options
| author | J-P Nurmi <jpnurmi@qt.io> | 2017-04-21 21:24:20 +0300 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@qt.io> | 2017-04-21 21:24:32 +0300 |
| commit | 2dc6251ecf98422fec842d924246c678b29bc333 (patch) | |
| tree | 7aefa07177e91a0adb8f38a0e452f312321c789f /src/quicktemplates2/qquickapplicationwindow.cpp | |
| parent | 5479c13959406ec5622fba22f8581f0d5cb09bf9 (diff) | |
| parent | 7faafa470eee71c51255e276e7b9df5beed2dd5b (diff) | |
Merge remote-tracking branch 'origin/5.9' into dev
Change-Id: I67d0991de16ad1039848df5099db59ea6aa728f8
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 9b220a2b..4a445d9b 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), @@ -694,6 +694,7 @@ bool QQuickApplicationWindow::isComponentComplete() const void QQuickApplicationWindow::classBegin() { Q_D(QQuickApplicationWindow); + d->complete = false; QQuickWindowQmlImpl::classBegin(); d->resolveFont(); } |