summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--tools/configure/configureapp.cpp5
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")))