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>

diff --git a/src/corelib/global/qcompilerdetection.h b/src/corelib/global/qcompilerdetection.h
index 5abf910..6cc754c 100644 (file)
--- 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
 
 /*