diff options
| author | Marc Mutz <marc.mutz.qnx@kdab.com> | 2012-07-09 15:05:33 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-07-09 15:27:18 +0200 |
| commit | b65291bc42c7e071e38efdd9ee6c4683f29aca13 (patch) | |
| tree | 7bb2824558bc9a53a317d2ad3546ad89952daa45 /src | |
| parent | 48b01da4d365a3a2b689c7374904fe6ba5e63520 (diff) | |
QNX: QtGlobal: compile as a C header again
<utility> is a C++ header, only execute the check for the
Dinkumware standard library if we're compiling under a
C++ compiler.
Change-Id: I1b24e76f20bfc03b70a330f9da96b4f815106e61
Reviewed-by: Thomas McGuire <thomas.mcguire@kdab.com>
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/corelib/global/qcompilerdetection.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/corelib/global/qcompilerdetection.h b/src/corelib/global/qcompilerdetection.h index 5abf910254..6cc754c412 100644 --- a/src/corelib/global/qcompilerdetection.h +++ b/src/corelib/global/qcompilerdetection.h @@ -661,7 +661,8 @@ //# define Q_COMPILER_INITIALIZER_LISTS #endif -#if defined(Q_OS_BLACKBERRY) || defined(Q_OS_QNX) +#ifdef __cplusplus +# if defined(Q_OS_BLACKBERRY) || defined(Q_OS_QNX) # include <utility> # if defined(_YVALS) || defined(_LIBCPP_VER) // QNX: libcpp (Dinkumware-based) doesn't have the <initializer_list> @@ -671,6 +672,7 @@ # undef Q_COMPILER_INITIALIZER_LISTS # endif # endif +# endif #endif // Q_OS_BLACKBERRY || Q_OS_QNX /* |