summaryrefslogtreecommitdiffstats
path: root/configure
diff options
context:
space:
mode:
authorOswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>2016-07-07 11:18:41 +0200
committerOswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>2016-07-22 10:21:36 +0000
commitdd59118b87d779e5cbfcd0b4ee2a3d5332433da9 (patch)
treefadbe87c2bd334130f37ccd98b66480f6b0a173a /configure
parentb5153d5bfab63da811b7a4615238d9e50198b412 (diff)
move c++11 test into qcompilerdetection.h and make it stricter
it positively makes no sense to have a configure test which will be never reached due to the configure/qmake bootstrap failing with a slew of totally unhelpful error messages. pre-standardization partial c++11 implementations are now rejected, except for VS2013, which is still sufficient despite not announcing full compatibility. Change-Id: I58af10e03960af06b80cedac105cf8433f7a1745 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'configure')
-rwxr-xr-xconfigure6
1 files changed, 1 insertions, 5 deletions
diff --git a/configure b/configure
index f2822503c4..0ba0c31e4a 100755
--- a/configure
+++ b/configure
@@ -4430,11 +4430,7 @@ fi
# Detect C++11 & up support
stdcxx_error=false
-if ! compileTest common/c++11 "C++11"; then
- echo "ERROR: Qt requires a C++11 compiler and yours does not seem to be that."
- echo "Please upgrade."
- exit 1
-elif [ "$CFG_STDCXX" = "c++11" ]; then
+if [ "$CFG_STDCXX" = "c++11" ]; then
: # CFG_STDCXX is correct
elif ! compileTest common/c++14 "C++14"; then
if [ "$CFG_STDCXX" != "auto" ]; then