diff options
| author | James McDonnell <jmcdonnell@blackberry.com> | 2016-12-07 11:10:51 -0500 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@qt.io> | 2017-01-20 17:49:25 +0000 |
| commit | 802e65d8568b17062ce23cc0d3574ac36c77d60f (patch) | |
| tree | 0c07d14c884eb9f1912ba11ad2db4e1982fc3ebd /src | |
| parent | fe11d175b10061a09a303f462787c49d4aa12687 (diff) | |
Adjust QNX choices
Don't use Dinkum choices when the C++ library is libC++ (QNX 7.0).
Change-Id: I18c3f716ccfb0c02dbfdc01eac4b707d3ae9aab6
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
(cherry picked from commit b0a9b9ab87aedab65888f8d71f3a33da06ba9c7d)
Diffstat (limited to 'src')
| -rw-r--r-- | src/corelib/global/qcompilerdetection.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/corelib/global/qcompilerdetection.h b/src/corelib/global/qcompilerdetection.h index 25e6e4c6bf..755e586d80 100644 --- a/src/corelib/global/qcompilerdetection.h +++ b/src/corelib/global/qcompilerdetection.h @@ -944,7 +944,7 @@ // Older versions (QNX 650) do not support C++11 features // _HAS_* macros are set to 1 by toolchains that actually include // Dinkum C++11 libcpp. -# if !defined(__GLIBCXX__) +# if !defined(__GLIBCXX__) && !defined(_LIBCPP_VERSION) # if !defined(_HAS_CPP0X) || !_HAS_CPP0X // Disable C++11 features that depend on library support # undef Q_COMPILER_INITIALIZER_LISTS |