diff options
| author | Sérgio Martins <sergio.martins@kdab.com> | 2015-03-28 21:46:23 +0000 |
|---|---|---|
| committer | Sérgio Martins <sergio.martins@kdab.com> | 2015-04-04 11:55:23 +0000 |
| commit | ddb0628181ba6f2ebeedf7e8f4186861ab63b628 (patch) | |
| tree | 1ef649ffab4535bbf0740023e86ff98ba8bc785c /src/corelib/global | |
| parent | 558c9cadddacea37669c28ec2abe62c8f5726e8e (diff) | |
Fix BlackBerry build.
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>
Diffstat (limited to 'src/corelib/global')
| -rw-r--r-- | src/corelib/global/qcompilerdetection.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/corelib/global/qcompilerdetection.h b/src/corelib/global/qcompilerdetection.h index 1774378c06..33a24a3866 100644 --- a/src/corelib/global/qcompilerdetection.h +++ b/src/corelib/global/qcompilerdetection.h @@ -910,6 +910,9 @@ # undef Q_COMPILER_UNICODE_STRINGS # undef Q_COMPILER_NOEXCEPT # endif +# if defined(_HAS_DINKUM_CLIB) && !defined(_HAS_NULLPTR_T) +# undef Q_COMPILER_NULLPTR +# endif # if defined(_HAS_DINKUM_CLIB) && !defined(_HAS_CONSTEXPR) // 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 |