summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/corelib/global/qglobal.h12
1 files changed, 12 insertions, 0 deletions
diff --git a/src/corelib/global/qglobal.h b/src/corelib/global/qglobal.h
index 41f3a27..4e360fe 100644
--- a/src/corelib/global/qglobal.h
+++ b/src/corelib/global/qglobal.h
@@ -849,6 +849,18 @@ namespace QT_NAMESPACE {}
# endif
#endif
+#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>
+// header, so the feature is useless, even if the compiler supports
+// it. Disable.
+# ifdef Q_COMPILER_INITIALIZER_LISTS
+# undef Q_COMPILER_INITIALIZER_LISTS
+# endif
+# endif
+#endif
+
/*
The window system, must be one of: (Q_WS_x)