From 8e991d04612eb1c39e665f42a3a0eb87b8070757 Mon Sep 17 00:00:00 2001 From: Kai Koehne Date: Wed, 26 Sep 2012 15:37:03 +0200 Subject: configure.exe: Don't print warning about -c++11 option by default Make sure that defaultTo() and therefore autoDetect() actually keep the "auto" setting for MSVC. We check for this later on in verifyConfiguration. Change-Id: Iebf1ef415161a09bbc871baa31ff9dc56d54acac Reviewed-by: Friedemann Kleint --- tools/configure/configureapp.cpp | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'tools/configure') diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp index 251fdfe152..fb8ccdb99c 100644 --- a/tools/configure/configureapp.cpp +++ b/tools/configure/configureapp.cpp @@ -1938,6 +1938,11 @@ QString Configure::defaultTo(const QString &option) && option == "SQL_OCI") return "no"; + // keep 'auto' default for msvc, since we can't set the language supported + if (option == "C++11" + && dictionary["QMAKESPEC"].contains("msvc")) + return "auto"; + if (option == "SYNCQT" && (!QFile::exists(sourcePath + "/bin/syncqt") || !QFile::exists(sourcePath + "/bin/syncqt.bat"))) -- cgit v1.2.3