1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
clang/g++ still warn when encountering the implementation of a
deprecated function.

Follows up 21a247adb47a45a23c0e014bd42979ccbeb11488

Change-Id: I6ab1695acb520ef7ce7cb1896545d02607c3ce29
Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@qt.io>
This commit is contained in:
Jake Petroules 2017-01-12 13:56:15 -08:00
parent 6255cb893d
commit 2f08a1d614
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

@ -1954,6 +1954,8 @@ QT_BEGIN_INCLUDE_NAMESPACE
QT_END_INCLUDE_NAMESPACE QT_END_INCLUDE_NAMESPACE
#if QT_DEPRECATED_SINCE(5, 9) #if QT_DEPRECATED_SINCE(5, 9)
QT_WARNING_PUSH
QT_WARNING_DISABLE_DEPRECATED
QSysInfo::MacVersion QSysInfo::macVersion() QSysInfo::MacVersion QSysInfo::macVersion()
{ {
const auto version = QOperatingSystemVersion::current(); const auto version = QOperatingSystemVersion::current();
@ -1970,6 +1972,7 @@ QSysInfo::MacVersion QSysInfo::macVersion()
#endif #endif
} }
const QSysInfo::MacVersion QSysInfo::MacintoshVersion = QSysInfo::macVersion(); const QSysInfo::MacVersion QSysInfo::MacintoshVersion = QSysInfo::macVersion();
QT_WARNING_POP
#endif #endif
#ifdef Q_OS_DARWIN #ifdef Q_OS_DARWIN