whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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>
bb10
Marc Mutz 2012-07-09 15:05:33 +02:00 committed by Qt by Nokia
parent 48b01da4d3
commit b65291bc42
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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
/*