diff options
| author | Simon Hausmann <simon.hausmann@theqtcompany.com> | 2015-06-03 15:55:39 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@theqtcompany.com> | 2015-06-04 05:56:24 +0000 |
| commit | bf0bdc5fbbb2b66d3ec41a600ef76e526c8ac278 (patch) | |
| tree | ec44478fe5ad0edf2fc0aaaa03aa2c7b438e2c23 /src/plugins/platforms/cocoa/qcocoawindow.h | |
| parent | 80bc743406f55f2d4470ee83364c87cfdce52356 (diff) | |
Fix crash in tst_qfiledialog on OS X
The test aggressively shows and hides dialogs and popups, and we would end up
installing this global event monitor frequently. However we never cleaned up
properly, for example if the window didn't get hidden properly or if the
monitor was already installed for some reason.
Change-Id: I6fa28eaeb03e089ced735912dbe29b0b8ad75d58
Reviewed-by: Andy Shaw <andy.shaw@theqtcompany.com>
Diffstat (limited to 'src/plugins/platforms/cocoa/qcocoawindow.h')
| -rw-r--r-- | src/plugins/platforms/cocoa/qcocoawindow.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/plugins/platforms/cocoa/qcocoawindow.h b/src/plugins/platforms/cocoa/qcocoawindow.h index fba97c2629..e2ab71a890 100644 --- a/src/plugins/platforms/cocoa/qcocoawindow.h +++ b/src/plugins/platforms/cocoa/qcocoawindow.h @@ -245,6 +245,8 @@ public: // for QNSView friend class QCocoaBackingStore; friend class QCocoaNativeInterface; + void removeMonitor(); + NSView *m_contentView; QNSView *m_qtView; QCocoaNSWindow *m_nsWindow; |