diff options
| author | Tor Arne Vestbø <tor.arne.vestbo@qt.io> | 2018-02-16 16:10:48 +0100 |
|---|---|---|
| committer | Tor Arne Vestbø <tor.arne.vestbo@qt.io> | 2018-03-05 19:31:14 +0000 |
| commit | d2ee858194448e7fc8a5a240464aefcb178961db (patch) | |
| tree | c63b2f4df363732423fefbf31453481a94d9cf2b /src/plugins/platforms/cocoa/qnsview.mm | |
| parent | 56149c0fbb19946050a3249acef4e86e511d3cd4 (diff) | |
macOS: Don't keep window flags around, we can get them from the QWindow
Change-Id: I629a58e699ad39ec429e1e275152434db4abc572
Reviewed-by: Morten Johan Sørvig <morten.sorvig@qt.io>
Diffstat (limited to 'src/plugins/platforms/cocoa/qnsview.mm')
| -rw-r--r-- | src/plugins/platforms/cocoa/qnsview.mm | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/plugins/platforms/cocoa/qnsview.mm b/src/plugins/platforms/cocoa/qnsview.mm index 6a79c76991..21d9d9ee90 100644 --- a/src/plugins/platforms/cocoa/qnsview.mm +++ b/src/plugins/platforms/cocoa/qnsview.mm @@ -546,7 +546,7 @@ Q_LOGGING_CATEGORY(lcQpaTablet, "qt.qpa.input.tablet") if (QCocoaWindow *popup = QCocoaIntegration::instance()->activePopupWindow()) { // Tooltips must be transparent for mouse events // The bug reference is QTBUG-46379 - if (!popup->m_windowFlags.testFlag(Qt::ToolTip)) { + if (!popup->window()->flags().testFlag(Qt::ToolTip)) { if (QNSView *popupView = qnsview_cast(popup->view())) targetView = popupView; } @@ -1437,7 +1437,7 @@ static QTabletEvent::TabletDevice wacomTabletDevice(NSEvent *theEvent) // Popups implicitly grab key events; forward to the active popup if there is one. // This allows popups to e.g. intercept shortcuts and close the popup in response. if (QCocoaWindow *popup = QCocoaIntegration::instance()->activePopupWindow()) { - if (!popup->m_windowFlags.testFlag(Qt::ToolTip)) + if (!popup->window()->flags().testFlag(Qt::ToolTip)) window = popup->window(); } |