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 <Friedemann.Kleint@digia.com>
This commit is contained in:
Kai Koehne 2012-09-26 15:37:03 +02:00 committed by The Qt Project
parent 99bab571b4
commit 8e991d0461

View File

@ -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")))