whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

qglobal.cpp/QSysInfo::windowsVersion(): Silence deprecation warning 

g++ still warns when encountering the implementation of a deprecated
function.

Change-Id: I6a25fc8c814590e5337069f9bced0cdec97653bf
Reviewed-by: Jake Petroules <jake.petroules@qt.io>
bb10
Friedemann Kleint 2016-12-14 08:25:10 +01:00
parent f8ec940ab6
commit 21a247adb4
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/corelib/global/qglobal.cpp
View File

@ -2033,6 +2033,8 @@ Q_GLOBAL_STATIC(QWindowsSockInit, winsockInit)
# endif // QT_BOOTSTRAPPED
#if QT_DEPRECATED_SINCE(5, 9)
QT_WARNING_PUSH
QT_WARNING_DISABLE_DEPRECATED
QSysInfo::WinVersion QSysInfo::windowsVersion()
{
const auto version = QOperatingSystemVersion::current();
@ -2047,6 +2049,7 @@ QSysInfo::WinVersion QSysInfo::windowsVersion()
return QSysInfo::WV_NT_based;
}
const QSysInfo::WinVersion QSysInfo::WindowsVersion = QSysInfo::windowsVersion();
QT_WARNING_POP
#endif
static QString winSp_helper()