diff options
| author | Tor Arne Vestbø <tor.arne.vestbo@qt.io> | 2017-09-25 14:11:00 +0200 |
|---|---|---|
| committer | Tor Arne Vestbø <tor.arne.vestbo@qt.io> | 2017-09-26 12:28:35 +0000 |
| commit | 4b6c1448047362b8c38d265e6414f0e3e59b8d37 (patch) | |
| tree | f52164a1f1d795fd43778409a39d0ab4b2962e5a /src/plugins/platforms/cocoa/qcocoaintegration.mm | |
| parent | bec9afba6e9f977f923357a53c60f8d88e0e6cd6 (diff) | |
Revert "Revert "macOS: Deduplicate QNSWindow/QNSPanel code""
This reverts commit 3ad8295451aa30a212eb6efe6330b5bfccd9f599.
The fix for the issue was landed in 5.10 as 1be1ed014b1deacb51fef4,
and will be merged into dev as a followup.
Change-Id: Id7773d1cc2caecbe358aadd9ade427a9c1eed9ef
Reviewed-by: Morten Johan Sørvig <morten.sorvig@qt.io>
Diffstat (limited to 'src/plugins/platforms/cocoa/qcocoaintegration.mm')
| -rw-r--r-- | src/plugins/platforms/cocoa/qcocoaintegration.mm | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/plugins/platforms/cocoa/qcocoaintegration.mm b/src/plugins/platforms/cocoa/qcocoaintegration.mm index 1df74c986a..7b1e689388 100644 --- a/src/plugins/platforms/cocoa/qcocoaintegration.mm +++ b/src/plugins/platforms/cocoa/qcocoaintegration.mm @@ -218,7 +218,7 @@ QWindow *QCocoaScreen::topLevelAt(const QPoint &point) const continue; id<QNSWindowProtocol> proto = static_cast<id<QNSWindowProtocol> >(nsWindow); - QCocoaWindow *cocoaWindow = proto.helper.platformWindow; + QCocoaWindow *cocoaWindow = proto.platformWindow; if (!cocoaWindow) continue; window = cocoaWindow->window(); |