diff options
author | Tor Arne Vestbø <tor.arne.vestbo@qt.io> | 2022-08-02 20:55:45 +0200 |
---|---|---|
committer | Tor Arne Vestbø <tor.arne.vestbo@qt.io> | 2022-08-05 16:45:02 +0200 |
commit | b9a9edc52fd88745f6f45c76e48f1c2e32677e5c (patch) | |
tree | 3e94a3eb1a60bdd198e183d99129aa78ae20c3c7 /src/plugins/platforms/cocoa | |
parent | 7fb25609a41ab9cc20ddd62e90f30c0536502aef (diff) |
macOS: Don't ifdef out code to resolve display name that might be used
The call to displayName is not guarded by the same ifdef.
Pick-to: 6.2 6.3 6.4
Change-Id: I169777130ec316a2d2f837621280acb061072501
Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>
Diffstat (limited to 'src/plugins/platforms/cocoa')
-rw-r--r-- | src/plugins/platforms/cocoa/qcocoascreen.mm | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/src/plugins/platforms/cocoa/qcocoascreen.mm b/src/plugins/platforms/cocoa/qcocoascreen.mm index ce8890d502..a8778ebe1d 100644 --- a/src/plugins/platforms/cocoa/qcocoascreen.mm +++ b/src/plugins/platforms/cocoa/qcocoascreen.mm @@ -195,7 +195,6 @@ QCocoaScreen::~QCocoaScreen() dispatch_release(m_displayLinkSource); } -#if QT_MACOS_DEPLOYMENT_TARGET_BELOW(__MAC_10_15) static QString displayName(CGDirectDisplayID displayID) { QIOType<io_iterator_t> iterator; @@ -227,7 +226,6 @@ static QString displayName(CGDirectDisplayID displayID) return QString(); } -#endif void QCocoaScreen::update(CGDirectDisplayID displayId) { |