diff options
| author | Liang Qi <liang.qi@theqtcompany.com> | 2016-02-16 07:02:56 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@theqtcompany.com> | 2016-02-16 07:02:56 +0100 |
| commit | 1d61e0052b6a94546f264c3a37a19db09003d7c8 (patch) | |
| tree | 9311e07960d5b08e9948b615f992c36e7bce1cf9 /src/dialogs/qquickabstractdialog_p.h | |
| parent | 571a44a4dde8f047773f4e91a4a6941cb4cdf212 (diff) | |
| parent | 67041bbc667a10ae14a15ed8755b2b1bbf91b686 (diff) | |
| download | qtquickcontrols-1d61e0052b6a94546f264c3a37a19db09003d7c8.tar.gz | |
Merge remote-tracking branch 'origin/5.6' into 5.7
Conflicts:
.qmake.conf
src/dialogs/qquickabstractfiledialog.cpp
src/dialogs/qquickfiledialog.cpp
Change-Id: I60aab7c7e819f82f82fc30f473b36a7a57d9a91a
Diffstat (limited to 'src/dialogs/qquickabstractdialog_p.h')
| -rw-r--r-- | src/dialogs/qquickabstractdialog_p.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/dialogs/qquickabstractdialog_p.h b/src/dialogs/qquickabstractdialog_p.h index da012e28..0a761bf3 100644 --- a/src/dialogs/qquickabstractdialog_p.h +++ b/src/dialogs/qquickabstractdialog_p.h @@ -155,7 +155,9 @@ protected: bool m_visible; Qt::WindowModality m_modality; -protected: // variables for pure-QML implementations only +protected: // variables and methods for pure-QML implementations only + void setDecorationDismissBehavior(); + QQuickItem *m_contentItem; QWindow *m_dialogWindow; QQuickItem *m_windowDecoration; |