diff options
| author | Marc Mutz <marc.mutz.qnx@kdab.com> | 2012-07-09 12:54:51 (GMT) |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-07-09 18:11:00 (GMT) |
| commit | 6857be1a8eac025d0adbac6c38a4fe86b8b6c140 (patch) | |
| tree | cc7603ea574373972927f573d83b647802f8422c /src | |
| parent | 3e679c01d2a83c2daeb2a655abc70913093b96c2 (diff) | |
| download | Qt-6857be1a8eac025d0adbac6c38a4fe86b8b6c140.zip Qt-6857be1a8eac025d0adbac6c38a4fe86b8b6c140.tar.gz Qt-6857be1a8eac025d0adbac6c38a4fe86b8b6c140.tar.bz2 | |
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.
This is a backport of Qt 5 change
b65291bc42c7e071e38efdd9ee6c4683f29aca13.
Change-Id: I12d5a2c5c003092127773d9c25623d012976c906
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/corelib/global/qglobal.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/corelib/global/qglobal.h b/src/corelib/global/qglobal.h index 4e360fe..406be66 100644 --- a/src/corelib/global/qglobal.h +++ b/src/corelib/global/qglobal.h @@ -849,7 +849,8 @@ namespace QT_NAMESPACE {} # endif #endif -#if defined(Q_OS_QNX) || defined(Q_OS_BLACKBERRY) +#ifdef __cplusplus +# if defined(Q_OS_QNX) || defined(Q_OS_BLACKBERRY) # include <utility> # if defined(_YVALS) || defined(_LIBCPP_VER) // QNX: libcpp (Dinkumware-based) doesn't have the <initializer_list> @@ -859,6 +860,7 @@ namespace QT_NAMESPACE {} # undef Q_COMPILER_INITIALIZER_LISTS # endif # endif +# endif #endif /* |