1 files changed, 23 insertions, 16 deletions

diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp
index 263cd6e78c..1800bfc873 100644
--- a/tools/configure/configureapp.cpp
+++ b/tools/configure/configureapp.cpp
@@ -1409,7 +1409,8 @@ void Configure::parseCmdLine()
         if (dictionary[ "QMAKESPEC" ].endsWith("-icc") ||
             dictionary[ "QMAKESPEC" ].endsWith("-msvc2012") ||
             dictionary[ "QMAKESPEC" ].endsWith("-msvc2013") ||
-            dictionary[ "QMAKESPEC" ].endsWith("-msvc2015")) {
+            dictionary[ "QMAKESPEC" ].endsWith("-msvc2015") ||
+            dictionary[ "QMAKESPEC" ].endsWith("-msvc2017")) {
             if (dictionary[ "MAKE" ].isEmpty()) dictionary[ "MAKE" ] = "nmake";
             dictionary[ "QMAKEMAKEFILE" ] = "Makefile.win32";
         } else if (dictionary[ "QMAKESPEC" ].startsWith(QLatin1String("win32-g++"))) {
@@ -4462,11 +4463,6 @@ Configure::ProjectType Configure::projectType(const QString& proFileName)
 
 bool Configure::showLicense(QString orgLicenseFile)
 {
-    if (dictionary["LICENSE_CONFIRMED"] == "yes") {
-        cout << "You have already accepted the terms of the license." << endl << endl;
-        return true;
-    }
-
     bool showGpl2 = true;
     QString licenseFile = orgLicenseFile;
     QString theLicense;
@@ -4514,7 +4510,7 @@ bool Configure::showLicense(QString orgLicenseFile)
             return false;
         } else {
             if (dictionary["EDITION"] == "OpenSource") {
-                if (accept == 'L')
+                if (accept == 'l')
                     licenseFile = orgLicenseFile + "/LICENSE.LGPL3";
                 else
                     licenseFile = orgLicenseFile + "/LICENSE.GPL2";
@@ -4576,21 +4572,32 @@ void Configure::readLicense()
         }
     }
     if (hasOpenSource && openSource) {
-        cout << endl << "This is the " << dictionary["PLATFORM NAME"] << " Open Source Edition." << endl;
+        cout << endl << "This is the " << dictionary["PLATFORM NAME"] << " Open Source Edition." << endl << endl;
         dictionary["LICENSEE"] = "Open Source";
         dictionary["EDITION"] = "OpenSource";
-        cout << endl;
-        if (!showLicense(dictionary["LICENSE FILE"])) {
-            cout << "Configuration aborted since license was not accepted";
-            dictionary["DONE"] = "error";
-            return;
-        }
     } else if (openSource) {
         cout << endl << "Cannot find the GPL license files! Please download the Open Source version of the library." << endl;
         dictionary["DONE"] = "error";
+    } else {
+        QString tpLicense = sourcePath + "/LICENSE.PREVIEW.COMMERCIAL";
+        if (QFile::exists(tpLicense)) {
+            cout << endl << "This is the Qt Preview Edition." << endl << endl;
+
+            dictionary["EDITION"] = "Preview";
+            dictionary["LICENSE FILE"] = tpLicense;
+        } else {
+            Tools::checkLicense(dictionary, sourcePath, buildPath);
+        }
     }
-    else {
-        Tools::checkLicense(dictionary, sourcePath, buildPath);
+
+    if (dictionary["LICENSE_CONFIRMED"] != "yes") {
+        if (!showLicense(dictionary["LICENSE FILE"])) {
+            cout << "Configuration aborted since license was not accepted" << endl;
+            dictionary["DONE"] = "error";
+            return;
+        }
+    } else if (dictionary["LICHECK"].isEmpty()) { // licheck executable shows license
+        cout << "You have already accepted the terms of the license." << endl << endl;
     }
 }