summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThiago Macieira <thiago.macieira@intel.com>2014-04-11 13:26:48 -0700
committerThe Qt Project <gerrit-noreply@qt-project.org>2014-04-14 18:41:02 +0200
commit070e1637ebe3ee899d44b92c948e2e148c237e03 (patch)
tree532803e9d34ce750387f48d836f72107c0ae52f4
parent94742faeceb44fd2d8131b12480e59b699b0ac6f (diff)
Disable all C++11 rvalue refs with Dinkumware C++ library too
Our code assumes that Q_COMPILER_REF_QUALIFIERS implies Q_COMPILER_RVALUE_REFS. Technically, it should check both macros, but the only point of ref qualifiers is to have both lvalue- and rvalue- reference member functions. We might then use std::move without a check to see if the standard library does provide it. Change-Id: Ia3eedd298c2218f100aee2e41bdea6e2c5c07a15 Reviewed-by: Marc Mutz <marc.mutz@kdab.com> Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com> Reviewed-by: Rafael Roquetto <rafael.roquetto@kdab.com>
-rw-r--r--src/corelib/global/qcompilerdetection.h3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/corelib/global/qcompilerdetection.h b/src/corelib/global/qcompilerdetection.h
index 1f82425459..e93201f102 100644
--- a/src/corelib/global/qcompilerdetection.h
+++ b/src/corelib/global/qcompilerdetection.h
@@ -849,7 +849,10 @@
// header, so the feature is useless, even if the compiler supports
// it. Disable.
# undef Q_COMPILER_INITIALIZER_LISTS
+// That libcpp doesn't have std::move either, so disable everything
+// related to rvalue refs.
# undef Q_COMPILER_RVALUE_REFS
+# undef Q_COMPILER_REF_QUALIFIERS
# endif
# endif
#endif // Q_OS_QNX