From b491bf11d656b729cb34b99b7f6d2cb34b134e0b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tor=20Arne=20Vestb=C3=B8?= <tor.arne.vestbo@qt.io>
Date: Tue, 2 Aug 2022 20:55:45 +0200
Subject: [PATCH] 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>
---
 src/plugins/platforms/cocoa/qcocoascreen.mm | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/plugins/platforms/cocoa/qcocoascreen.mm b/src/plugins/platforms/cocoa/qcocoascreen.mm
index ce8890d5025..a8778ebe1de 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)
 {