diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2016-12-14 08:25:10 +0100 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2016-12-14 17:45:04 +0000 |
| commit | 21a247adb47a45a23c0e014bd42979ccbeb11488 (patch) | |
| tree | 6099cc1a21298fc078cc591077d29411a053afad | |
| parent | f8ec940ab6ba265c9f8c8be68f8e4a487854e6ff (diff) | |
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>
| -rw-r--r-- | src/corelib/global/qglobal.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
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() |