diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2016-07-07 11:18:41 +0200 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2016-07-22 10:21:36 +0000 |
| commit | dd59118b87d779e5cbfcd0b4ee2a3d5332433da9 (patch) | |
| tree | fadbe87c2bd334130f37ccd98b66480f6b0a173a /tools | |
| parent | b5153d5bfab63da811b7a4615238d9e50198b412 (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 'tools')
| -rw-r--r-- | tools/configure/configureapp.cpp | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp index a89e66c377..0fa205bd98 100644 --- a/tools/configure/configureapp.cpp +++ b/tools/configure/configureapp.cpp @@ -2310,12 +2310,7 @@ void Configure::autoDetection() detectArch(); if (dictionary["C++STD"] == "auto" && !dictionary["QMAKESPEC"].contains("msvc")) { - if (!tryCompileProject("common/c++11")) { - dictionary["DONE"] = "error"; - cout << "ERROR: Qt requires a C++11 compiler and yours does not seem to be that." << endl - << "Please upgrade." << endl; - return; - } else if (!tryCompileProject("common/c++14")) { + if (!tryCompileProject("common/c++14")) { dictionary["C++STD"] = "c++11"; } else if (!tryCompileProject("common/c++1z")) { dictionary["C++STD"] = "c++14"; |