diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-04-27 03:01:14 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-04-27 03:01:14 +0200 |
| commit | d2a661f16e9982c45260efb9875b83c581b82287 (patch) | |
| tree | 3a5f52f5509617c7e55788dd443bb8645a6adc37 /src/dialogs/qquickabstractdialog_p.h | |
| parent | bdff4debf5f3f8125e3b7876bb5c62bc4251727f (diff) | |
| parent | 44fe49e573539e22709c2d5c996f1ca9ee8fd760 (diff) | |
Merge remote-tracking branch 'origin/5.13' into dev
Change-Id: I1eda6648cc10fd5e0d5148fd357ebb04135acc68
Diffstat (limited to 'src/dialogs/qquickabstractdialog_p.h')
| -rw-r--r-- | src/dialogs/qquickabstractdialog_p.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/dialogs/qquickabstractdialog_p.h b/src/dialogs/qquickabstractdialog_p.h index 54dbaace0..a861739ba 100644 --- a/src/dialogs/qquickabstractdialog_p.h +++ b/src/dialogs/qquickabstractdialog_p.h @@ -167,7 +167,8 @@ protected: // variables and methods for pure-QML implementations only bool m_visibleChangedConnected; bool m_dialogHelperInUse; - static QQmlComponent *m_decorationComponent; + QQmlComponent *m_decorationComponent = nullptr; + static QUrl m_decorationComponentUrl; friend class QtQuick2DialogsPlugin; |