1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

macOS: Don't ifdef out code to resolve display name that might be used

Browse Source 
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>
This commit is contained in:
Tor Arne Vestbø 2022-08-02 20:55:45 +02:00 committed by Qt Cherry-pick Bot
parent 53cdf7525e
commit b491bf11d6
1 changed files with 0 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/platforms/cocoa/qcocoascreen.mm
View File

@ -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)
{