summaryrefslogtreecommitdiffstats
path: root/tools/configure/configureapp.cpp
diff options
context:
space:
mode:
authorOswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>2016-08-23 19:20:37 +0200
committerOswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>2016-08-25 11:58:46 +0000
commitb71d6ac713da96581494a0b80b4f8e73b5902496 (patch)
treebcaec14ac32f5b0eb22ba165bb4e5e6574a7ba49 /tools/configure/configureapp.cpp
parentc92f0d204926862a00101d2b124abacc9bf6977f (diff)
ensure that no license queries are made in -redo mode
implement it in configure.exe and fix it in configure.sh. Change-Id: I30764f4cba4bad0f23bfb40ce7a2ca614e1afd71 Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Diffstat (limited to 'tools/configure/configureapp.cpp')
-rw-r--r--tools/configure/configureapp.cpp14
1 files changed, 11 insertions, 3 deletions
diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp
index 24f89318fa..cc46fb99cb 100644
--- a/tools/configure/configureapp.cpp
+++ b/tools/configure/configureapp.cpp
@@ -532,9 +532,6 @@ void Configure::parseCmdLine()
cout << "Invalid option \"" << dictionary["XQMAKESPEC"] << "\" for -xplatform." << endl;
}
}
-
- if ((dictionary["REDO"] != "yes") && (dictionary["DONE"] != "error"))
- saveCmdLine();
}
/*!
@@ -1026,6 +1023,9 @@ void Configure::configure()
cout << "Qmake failed, return code " << exitCode << endl << endl;
dictionary[ "DONE" ] = "error";
}
+
+ if ((dictionary["REDO"] != "yes") && (dictionary["DONE"] != "error"))
+ saveCmdLine();
}
void Configure::generateMakefiles()
@@ -1093,6 +1093,7 @@ bool Configure::showLicense(QString orgLicenseFile)
accept = tolower(accept);
if (accept == 'y') {
+ configCmdLine << "-confirm-license";
return true;
} else if (accept == 'n') {
return false;
@@ -1172,10 +1173,17 @@ void Configure::readLicense()
} else if (openSource) {
cout << endl << "Cannot find the GPL license files! Please download the Open Source version of the library." << endl;
dictionary["DONE"] = "error";
+ return;
}
else {
Tools::checkLicense(dictionary, sourcePath, buildPath);
}
+ if (dictionary["BUILDTYPE"] == "none") {
+ if (openSource)
+ configCmdLine << "-opensource";
+ else
+ configCmdLine << "-commercial";
+ }
}
bool Configure::reloadCmdLine(int idx)