diff options
| author | Thiago Macieira <thiago.macieira@intel.com> | 2017-04-26 09:47:05 -0300 |
|---|---|---|
| committer | Thiago Macieira <thiago.macieira@intel.com> | 2017-04-27 15:27:25 +0000 |
| commit | c1e19a2ecb182ec95eb06de1a35969ac5f56ffd6 (patch) | |
| tree | 7219f23414a306de19a661ed219627848293227e | |
| parent | b6968f508c36c650c9965f1747beae8fa6b237c5 (diff) | |
QSysInfo: Make use of the QT_WARNING_DISABLE_DEPRECATED macro
We have it for a reason.
Change-Id: I84e363d735b443cb9beefffd14b8f355aeb8a31c
Reviewed-by: Jake Petroules <jake.petroules@qt.io>
| -rw-r--r-- | src/corelib/global/qsysinfo.h | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/src/corelib/global/qsysinfo.h b/src/corelib/global/qsysinfo.h index f443ab4b93..6b73a17dc5 100644 --- a/src/corelib/global/qsysinfo.h +++ b/src/corelib/global/qsysinfo.h @@ -211,11 +211,7 @@ public: }; QT_WARNING_PUSH -QT_WARNING_DISABLE_GCC("-Wdeprecated-declarations") -QT_WARNING_DISABLE_CLANG("-Wdeprecated-declarations") -QT_WARNING_DISABLE_INTEL(1478) -QT_WARNING_DISABLE_INTEL(1786) -QT_WARNING_DISABLE_MSVC(4996) +QT_WARNING_DISABLE_DEPRECATED #if defined(Q_OS_WIN) || defined(Q_OS_CYGWIN) QT_SYSINFO_DEPRECATED_X("Use QOperatingSystemVersion::current()") static const WinVersion WindowsVersion; QT_SYSINFO_DEPRECATED_X("Use QOperatingSystemVersion::current()") static WinVersion windowsVersion(); |