From 3c070b58b29a4ff4ea8cdc913a1e236042ee4fda Mon Sep 17 00:00:00 2001 From: Kalle Viironen Date: Mon, 31 Mar 2014 16:09:22 +0300 Subject: Use configure -confirm-license option also in commercial Qt versions Pass the -confirm-license option to external license checker which is used in Qt commercial version. Change-Id: I62326d1e6a8307dae64535ecf2ced762130b7e8f Reviewed-by: Miikka Heikkinen Reviewed-by: Samuli Piippo --- tools/configure/tools.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'tools/configure') diff --git a/tools/configure/tools.cpp b/tools/configure/tools.cpp index e2a6f3cc8a..c0626e1950 100644 --- a/tools/configure/tools.cpp +++ b/tools/configure/tools.cpp @@ -71,8 +71,9 @@ void Tools::checkLicense(QMap &dictionary, const QString 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, + dictionary.value("LICENSE_CONFIRMED", "no"), QDir::toNativeSeparators(sourcePath), QDir::toNativeSeparators(buildPath), qMakeSpec, xQMakeSpec); -- cgit v1.2.3