diff options
author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-02-28 20:38:46 +0100 |
---|---|---|
committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-02-28 20:38:47 +0100 |
commit | 699a263b29edc26473948d6638232b675409338b (patch) | |
tree | 0699b08ad6e6055bf3534f69a30e34e4127371a1 /src/plugins/platforms/cocoa | |
parent | 96ffe48add521e29d883814a35b1130b9dfdd636 (diff) | |
parent | 5d365b96b9a9d8585a0be5cc1c2376b7b2f27101 (diff) |
Merge remote-tracking branch 'origin/5.11' into dev
Change-Id: Ib21e6b9030b4d5363f440d082ce3df28098d1b95
Diffstat (limited to 'src/plugins/platforms/cocoa')
-rw-r--r-- | src/plugins/platforms/cocoa/qcocoawindow.mm | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/plugins/platforms/cocoa/qcocoawindow.mm b/src/plugins/platforms/cocoa/qcocoawindow.mm index 3bc9055650..0ece15d1fa 100644 --- a/src/plugins/platforms/cocoa/qcocoawindow.mm +++ b/src/plugins/platforms/cocoa/qcocoawindow.mm @@ -1257,6 +1257,11 @@ void QCocoaWindow::recreateWindowIfNeeded() if ((isContentView() && !shouldBeContentView) || (recreateReason & PanelChanged)) { if (m_nsWindow) { qCDebug(lcQpaCocoaWindow) << "Getting rid of existing window" << m_nsWindow; + if (m_nsWindow.observationInfo) { + qCCritical(lcQpaCocoaWindow) << m_nsWindow << "has active key-value observers (KVO)!" + << "These will stop working now that the window is recreated, and will result in exceptions" + << "when the observers are removed. Break in QCocoaWindow::recreateWindowIfNeeded to debug."; + } [m_nsWindow closeAndRelease]; if (isContentView()) { // We explicitly disassociate m_view from the window's contentView, |