Merge remote-tracking branch 'origin/5.6' into 5.7

Conflicts:
	src/plugins/platforms/qnx/qqnxscreeneventhandler.cpp

Change-Id: I0af32ee55936d523cbd259b6fe82eb9c409f9074

1 files changed, 24 insertions, 0 deletions

diff --git a/tools/configure/environment.cpp b/tools/configure/environment.cpp
index 5189883901..1a05c9ce62 100644
--- a/tools/configure/environment.cpp
+++ b/tools/configure/environment.cpp
@@ -147,6 +147,30 @@ QString Environment::gccVersion()
     return version;
 }
 
+QString Environment::msvcVersion()
+{
+    int returnValue = 0;
+    // Extract version from standard error output of "cl /?"
+    const QString command = QFile::decodeName(qgetenv("ComSpec"))
+        + QLatin1String(" /c ") + QLatin1String(compilerInfo(CC_MSVC2015)->executable)
+        + QLatin1String(" /? 2>&1");
+    QString version = execute(command, &returnValue);
+    if (returnValue != 0) {
+        cout << "Could not get cl version" << returnValue << qPrintable(version) << '\n';;
+        version.clear();
+    } else {
+        QRegExp versionRegexp(QStringLiteral("^.*Compiler Version ([0-9.]+) for.*$"));
+        Q_ASSERT(versionRegexp.isValid());
+        if (versionRegexp.exactMatch(version)) {
+            version = versionRegexp.cap(1);
+        } else {
+            cout << "Unable to determine cl version from the output of \""
+                << qPrintable(command) << "\"\n";
+        }
+    }
+    return version;
+}
+
 /*!
     Returns the enum of the compiler which was detected on the system.
     The compilers are detected in the order as entered into the