Browse Source

UI: Guard GetMonitorName behind Qt < 6.4

d27cda1 made this unnecessary on other Qt versions
gxalpha 2 years ago
parent
commit
53caee8ceb
2 changed files with 4 additions and 0 deletions
  1. 2 0
      UI/platform-windows.cpp
  2. 2 0
      UI/platform.hpp

+ 2 - 0
UI/platform-windows.cpp

@@ -356,6 +356,7 @@ static BOOL CALLBACK GetMonitorCallback(HMONITOR monitor, HDC, LPRECT,
 	return true;
 }
 
+#if QT_VERSION < QT_VERSION_CHECK(6, 4, 0)
 #define GENERIC_MONITOR_NAME QStringLiteral("Generic PnP Monitor")
 
 QString GetMonitorName(const QString &id)
@@ -417,6 +418,7 @@ QString GetMonitorName(const QString &id)
 
 	return QString::fromWCharArray(target.monitorFriendlyDeviceName);
 }
+#endif
 
 /* Based on https://www.winehq.org/pipermail/wine-devel/2008-September/069387.html */
 typedef const char *(CDECL *WINEGETVERSION)(void);

+ 2 - 0
UI/platform.hpp

@@ -74,7 +74,9 @@ public:
 	RunOnceMutex &operator=(RunOnceMutex &&rom);
 };
 
+#if QT_VERSION < QT_VERSION_CHECK(6, 4, 0)
 QString GetMonitorName(const QString &id);
+#endif
 bool IsRunningOnWine();
 #endif