From 032f0f543e1f0bcbec7ad2881f15af0ce50058c2 Mon Sep 17 00:00:00 2001 From: Thiago Macieira Date: Mon, 23 Jun 2014 18:43:06 -0700 Subject: Fix building of the C++11 config.test on Windows with ICL The Intel compiler does support C++11 options on the command-line. configure.exe will correctly try to run it, but the test would fail for incorrect reasons. First, we need to pass the option -Qstd=c++11 to enable it. Second, on Windows, the GCC experimental define isn't defined, nor is __cplusplus updated yet. So we have to rely on the Intel-specific macro. Third, we need CONFIG += console so that the application succeeds in linking against a main() function, as opposed to a WinMain one. Change-Id: I8f3252189df4f8854a9d9aa2cd919c288d2df420 Reviewed-by: Oswald Buddenhagen Reviewed-by: Thiago Macieira --- mkspecs/win32-icc/qmake.conf | 1 + 1 file changed, 1 insertion(+) (limited to 'mkspecs/win32-icc/qmake.conf') diff --git a/mkspecs/win32-icc/qmake.conf b/mkspecs/win32-icc/qmake.conf index a20d7c3122..2985b9ee82 100644 --- a/mkspecs/win32-icc/qmake.conf +++ b/mkspecs/win32-icc/qmake.conf @@ -39,6 +39,7 @@ QMAKE_CXXFLAGS_RTTI_ON = -GR QMAKE_CXXFLAGS_RTTI_OFF = QMAKE_CXXFLAGS_EXCEPTIONS_ON = -GX QMAKE_CXXFLAGS_EXCEPTIONS_OFF = +QMAKE_CXXFLAGS_CXX11 = -Qstd=c++11 QMAKE_INCDIR = -- cgit v1.2.3