summaryrefslogtreecommitdiffstats
path: root/config.tests/common
diff options
context:
space:
mode:
Diffstat (limited to 'config.tests/common')
-rw-r--r--config.tests/common/c++11/c++11.cpp4
-rw-r--r--config.tests/common/c++11/c++11.pro2
2 files changed, 3 insertions, 3 deletions
diff --git a/config.tests/common/c++11/c++11.cpp b/config.tests/common/c++11/c++11.cpp
index 2c501ad6ca..b41ac7001b 100644
--- a/config.tests/common/c++11/c++11.cpp
+++ b/config.tests/common/c++11/c++11.cpp
@@ -39,10 +39,10 @@
**
****************************************************************************/
-#if __cplusplus >= 201103L || defined(__GXX_EXPERIMENTAL_CXX0X__)
+#if __cplusplus >= 201103L || defined(__GXX_EXPERIMENTAL_CXX0X__) || defined(__INTEL_CXX11_MODE__)
// Compiler claims to support C++11, trust it
#else
-# error "__cplusplus must be >= 201103L, or __GXX_EXPERIMENTAL_CXX0X__ must be defined"
+# error "__cplusplus must be >= 201103L, or one of __GXX_EXPERIMENTAL_CXX0X__ or __INTEL_CXX11_MODE__ must be defined"
#endif
#include <utility>
diff --git a/config.tests/common/c++11/c++11.pro b/config.tests/common/c++11/c++11.pro
index dbe764ba84..3620f99c71 100644
--- a/config.tests/common/c++11/c++11.pro
+++ b/config.tests/common/c++11/c++11.pro
@@ -1,3 +1,3 @@
SOURCES = c++11.cpp
-CONFIG += c++11
+CONFIG += c++11 console
CONFIG -= qt