diff options
| author | Kai Koehne <[email protected]> | 2016-09-16 11:27:00 +0200 |
|---|---|---|
| committer | Kai Koehne <[email protected]> | 2016-11-22 08:36:49 +0000 |
| commit | a9af3c85022994cfe18a05cd92db9fc0b0ad902c (patch) | |
| tree | 5b34ed26abe2d70cd00514ab71bc1faf759ee3a3 /tools/configure/tools.cpp | |
| parent | e1f0e08e9a290689f2778ffcfafc133f8a1b99cf (diff) | |
win: Show Tech Preview license
Show the tech preview license for commercial users if -confirm-license
is not set. This matches what the configure shell script is doing, too.
Task-number: QTBUG-55676
Change-Id: I69f5553ab53dfcdc14c200e682c024a6cebee8fe
Reviewed-by: Oswald Buddenhagen <[email protected]>
Diffstat (limited to 'tools/configure/tools.cpp')
| -rw-r--r-- | tools/configure/tools.cpp | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/tools/configure/tools.cpp b/tools/configure/tools.cpp index 095e798332f..02c74282cdf 100644 --- a/tools/configure/tools.cpp +++ b/tools/configure/tools.cpp @@ -47,13 +47,6 @@ using namespace std; void Tools::checkLicense(QMap<QString,QString> &dictionary, const QString &sourcePath, const QString &buildPath) { - QString tpLicense = sourcePath + "/LICENSE.PREVIEW.COMMERCIAL"; - if (QFile::exists(tpLicense)) { - dictionary["EDITION"] = "Preview"; - dictionary["LICENSE FILE"] = tpLicense; - return; - } - dictionary["LICHECK"] = "licheck.exe"; const QString licenseChecker = @@ -80,6 +73,7 @@ void Tools::checkLicense(QMap<QString,QString> &dictionary, } else { foreach (const QString &var, licheckOutput.split('\n')) dictionary[var.section('=', 0, 0).toUpper()] = var.section('=', 1, 1); + dictionary["LICENSE_CONFIRMED"] = "yes"; } } else { cout << endl << "Error: Could not find licheck.exe" << endl |