From 2f08a1d6146ab3529baad839eb9dbfc1a1182720 Mon Sep 17 00:00:00 2001 From: Jake Petroules Date: Thu, 12 Jan 2017 13:56:15 -0800 Subject: [PATCH] qglobal.cpp/QSysInfo::macVersion(): Silence deprecation warning clang/g++ still warn when encountering the implementation of a deprecated function. Follows up 21a247adb47a45a23c0e014bd42979ccbeb11488 Change-Id: I6ab1695acb520ef7ce7cb1896545d02607c3ce29 Reviewed-by: Gabriel de Dietrich --- 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 48dbadbda94..1170fff16a8 100644 --- a/src/corelib/global/qglobal.cpp +++ b/src/corelib/global/qglobal.cpp @@ -1954,6 +1954,8 @@ QT_BEGIN_INCLUDE_NAMESPACE QT_END_INCLUDE_NAMESPACE #if QT_DEPRECATED_SINCE(5, 9) +QT_WARNING_PUSH +QT_WARNING_DISABLE_DEPRECATED QSysInfo::MacVersion QSysInfo::macVersion() { const auto version = QOperatingSystemVersion::current(); @@ -1970,6 +1972,7 @@ QSysInfo::MacVersion QSysInfo::macVersion() #endif } const QSysInfo::MacVersion QSysInfo::MacintoshVersion = QSysInfo::macVersion(); +QT_WARNING_POP #endif #ifdef Q_OS_DARWIN