AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Adjust QNX choices

Browse Source 
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>
This commit is contained in:
James McDonnell 2016-12-07 11:10:51 -05:00
parent e7b8df6349
commit b0a9b9ab87
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/corelib/global/qcompilerdetection.h
View File

@ -999,7 +999,7 @@
// Older versions (QNX 650) do not support C++11 features // Older versions (QNX 650) do not support C++11 features
// _HAS_* macros are set to 1 by toolchains that actually include // _HAS_* macros are set to 1 by toolchains that actually include
// Dinkum C++11 libcpp. // Dinkum C++11 libcpp.
# if !defined(__GLIBCXX__) # if !defined(__GLIBCXX__) && !defined(_LIBCPP_VERSION)
# if !defined(_HAS_CPP0X) || !_HAS_CPP0X # if !defined(_HAS_CPP0X) || !_HAS_CPP0X
// Disable C++11 features that depend on library support // Disable C++11 features that depend on library support
# undef Q_COMPILER_INITIALIZER_LISTS # undef Q_COMPILER_INITIALIZER_LISTS