diff options
| author | Tor Arne Vestbø <tor.arne.vestbo@qt.io> | 2022-08-02 20:55:45 +0200 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2022-08-05 17:29:25 +0000 |
| commit | 1124c39bc8db6c4cf55f30219c29536a2be349d8 (patch) | |
| tree | 4b924ad0ba4812dcacb1f08869579753d2b07aea | |
| parent | a6bcd59429145de018ebb068ffc98c31fb6c833a (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.
Change-Id: I169777130ec316a2d2f837621280acb061072501
Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>
(cherry picked from commit b9a9edc52fd88745f6f45c76e48f1c2e32677e5c)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
| -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 bbb0f46b25..9378655e16 100644 --- a/src/plugins/platforms/cocoa/qcocoascreen.mm +++ b/src/plugins/platforms/cocoa/qcocoascreen.mm @@ -231,7 +231,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; @@ -263,7 +262,6 @@ static QString displayName(CGDirectDisplayID displayID) return QString(); } -#endif void QCocoaScreen::update(CGDirectDisplayID displayId) { |