diff options
| author | Marc Mutz <marc.mutz@kdab.com> | 2017-06-22 21:35:44 +0200 |
|---|---|---|
| committer | Marc Mutz <marc.mutz@kdab.com> | 2017-06-28 16:30:42 +0000 |
| commit | b7227d7c40c856674cb7608f2eed6e61ca327442 (patch) | |
| tree | 0cc75a30d419ca247c4771b179c8f8eb346268e5 /src/corelib/global/qoperatingsystemversion.cpp | |
| parent | d0ff272af3a44007fa12e7ffbe074ce7a6732cc0 (diff) | |
QOperatingSystemVersion: (potentially) fix compilation with QNX 6
According to qcompilerdetection.h, the Dinkumware C++ library does not
have std::initializer_list, even though the compiler supports it.
Add the missing Q_COMPILER_ guards.
Change-Id: I84a7d5054c00dba38bcde15e277ceb0ee05e6cd7
Reviewed-by: Jake Petroules <jake.petroules@qt.io>
Reviewed-by: James McDonnell <jmcdonnell@blackberry.com>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'src/corelib/global/qoperatingsystemversion.cpp')
| -rw-r--r-- | src/corelib/global/qoperatingsystemversion.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/corelib/global/qoperatingsystemversion.cpp b/src/corelib/global/qoperatingsystemversion.cpp index 0813b3b25f..83ba6e69ee 100644 --- a/src/corelib/global/qoperatingsystemversion.cpp +++ b/src/corelib/global/qoperatingsystemversion.cpp @@ -336,6 +336,7 @@ QString QOperatingSystemVersion::name() const } } +#ifdef Q_COMPILER_INITIALIZER_LISTS /*! \fn bool QOperatingSystemVersion::isAnyOfType(std::initializer_list<OSType> types) const @@ -350,6 +351,7 @@ bool QOperatingSystemVersion::isAnyOfType(std::initializer_list<OSType> types) c } return false; } +#endif /*! \variable QOperatingSystemVersion::Windows7 |