diff options
| author | Tor Arne Vestbø <tor.arne.vestbo@qt.io> | 2016-10-12 15:04:11 +0200 |
|---|---|---|
| committer | Tor Arne Vestbø <tor.arne.vestbo@qt.io> | 2016-10-13 15:56:12 +0000 |
| commit | 2f505b79a49bdf5ba8d084e13ab339bcf956c849 (patch) | |
| tree | bbd32bfd30ab4f0877c64dc242f79a0c47ebe77c /src/plugins/platforms/cocoa/qnsview.h | |
| parent | 1d6eb70dcec105af28d6a5e9b59d56c895c70389 (diff) | |
macOS: Use QPointer to track QNSView -> QCocoaWindow
Change-Id: I4de581dda03d25e781112eff34de28dfd1797a7f
Reviewed-by: Morten Johan Sørvig <morten.sorvig@qt.io>
Diffstat (limited to 'src/plugins/platforms/cocoa/qnsview.h')
| -rw-r--r-- | src/plugins/platforms/cocoa/qnsview.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/plugins/platforms/cocoa/qnsview.h b/src/plugins/platforms/cocoa/qnsview.h index 963b29ebbb..57b159bbf5 100644 --- a/src/plugins/platforms/cocoa/qnsview.h +++ b/src/plugins/platforms/cocoa/qnsview.h @@ -65,7 +65,7 @@ Q_FORWARD_DECLARE_OBJC_CLASS(QT_MANGLE_NAMESPACE(QNSViewMouseMoveHelper)); uchar *m_maskData; bool m_shouldInvalidateWindowShadow; QPointer<QWindow> m_window; - QCocoaWindow *m_platformWindow; + QPointer<QCocoaWindow> m_platformWindow; NSTrackingArea *m_trackingArea; Qt::MouseButtons m_buttons; Qt::MouseButtons m_acceptedMouseDowns; @@ -92,7 +92,6 @@ Q_FORWARD_DECLARE_OBJC_CLASS(QT_MANGLE_NAMESPACE(QNSViewMouseMoveHelper)); - (id)init; - (id)initWithQWindow:(QWindow *)window platformWindow:(QCocoaWindow *) platformWindow; -- (void) clearQWindowPointers; #ifndef QT_NO_OPENGL - (void)setQCocoaGLContext:(QCocoaGLContext *)context; #endif |