diff options
| author | Kai Koehne <kai.koehne@digia.com> | 2012-09-26 15:37:03 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2012-09-27 06:07:22 +0200 |
| commit | 8e991d04612eb1c39e665f42a3a0eb87b8070757 (patch) | |
| tree | 41203bf64999050938535c4048fb22165e8a46c4 /tools/configure | |
| parent | 99bab571b4cb41362e891f1bb1e812119701c932 (diff) | |
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>
Diffstat (limited to 'tools/configure')
| -rw-r--r-- | tools/configure/configureapp.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
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"))) |