AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use configure -confirm-license option also in commercial Qt versions

Browse Source 
Pass the -confirm-license option to external license checker which is
used in Qt commercial version.

Change-Id: I62326d1e6a8307dae64535ecf2ced762130b7e8f
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
Reviewed-by: Samuli Piippo <samuli.piippo@digia.com>
This commit is contained in:
Kalle Viironen 2014-03-31 16:09:22 +03:00 committed by The Qt Project
parent 0cb2c760c2
commit 3c070b58b2
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
configure vendored
View File

@ -2773,7 +2773,8 @@ if [ -f "$relpath"/LICENSE.PREVIEW.COMMERCIAL ] && [ $COMMERCIAL_USER = "yes" ];
EditionString="Technology Preview" EditionString="Technology Preview"
elif [ $COMMERCIAL_USER = "yes" ]; then elif [ $COMMERCIAL_USER = "yes" ]; then
if test -x "$relpath/bin/licheck"; then if test -x "$relpath/bin/licheck"; then
LicheckOutput=`$relpath/bin/licheck $relpath $outpath $PLATFORM $XPLATFORM` LicheckOutput=`$relpath/bin/licheck $OPT_CONFIRM_LICENSE $relpath $outpath\
$PLATFORM $XPLATFORM`
if [ $? -ne 0 ]; then if [ $? -ne 0 ]; then
exit 1 exit 1
else else

3
tools/configure/tools.cpp
View File

@ -71,8 +71,9 @@ void Tools::checkLicense(QMap<QString,QString> &dictionary,
const QString xQMakeSpec = const QString xQMakeSpec =
QDir::toNativeSeparators(dictionary.value("XQMAKESPEC")); QDir::toNativeSeparators(dictionary.value("XQMAKESPEC"));
QString command = QString("%1 %2 %3 %4 %5") QString command = QString("%1 %2 %3 %4 %5 %6")
.arg(licenseChecker, .arg(licenseChecker,
dictionary.value("LICENSE_CONFIRMED", "no"),
QDir::toNativeSeparators(sourcePath), QDir::toNativeSeparators(sourcePath),
QDir::toNativeSeparators(buildPath), QDir::toNativeSeparators(buildPath),
qMakeSpec, xQMakeSpec); qMakeSpec, xQMakeSpec);