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

Fix BlackBerry build.

Browse Source 
BlackBerry SDK uses gcc 4.6 which supports nullptr, but by default
it uses the dinkum C++ library, which doesn't support nullptr_t.

Change-Id: Ifa95029a9bfa4dc2fc064db5d7a67012e95ac0e2
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
This commit is contained in:
Sérgio Martins 2015-03-28 21:46:23 +00:00
parent 558c9caddd
commit ddb0628181
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/qcompilerdetection.h
View File

@ -910,6 +910,9 @@
# undef Q_COMPILER_UNICODE_STRINGS # undef Q_COMPILER_UNICODE_STRINGS
# undef Q_COMPILER_NOEXCEPT # undef Q_COMPILER_NOEXCEPT
# endif # endif
# if defined(_HAS_DINKUM_CLIB) && !defined(_HAS_NULLPTR_T)
# undef Q_COMPILER_NULLPTR
# endif
# if defined(_HAS_DINKUM_CLIB) && !defined(_HAS_CONSTEXPR) # if defined(_HAS_DINKUM_CLIB) && !defined(_HAS_CONSTEXPR)
// The libcpp is missing constexpr keywords on important functions like std::numeric_limits<>::min() // The libcpp is missing constexpr keywords on important functions like std::numeric_limits<>::min()
// Disable constexpr support on QNX even if the compiler supports it // Disable constexpr support on QNX even if the compiler supports it