From 21a247adb47a45a23c0e014bd42979ccbeb11488 Mon Sep 17 00:00:00 2001 From: Friedemann Kleint Date: Wed, 14 Dec 2016 08:25:10 +0100 Subject: 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 --- src/corelib/global/qglobal.cpp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/corelib/global/qglobal.cpp b/src/corelib/global/qglobal.cpp index 47aca712b7..48dbadbda9 100644 --- a/src/corelib/global/qglobal.cpp +++ b/src/corelib/global/qglobal.cpp @@ -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() -- cgit v1.2.3