diff options
| author | Kalle Viironen <kalle.viironen@digia.com> | 2014-03-31 16:09:22 +0300 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-04-01 11:15:52 +0200 |
| commit | 3c070b58b29a4ff4ea8cdc913a1e236042ee4fda (patch) | |
| tree | 08a9d365d2293546ee24ebec2d8c0060859869e0 /tools | |
| parent | 0cb2c760c219514849ab0f6be8e5368f92dfa5d9 (diff) | |
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 <miikka.heikkinen@digia.com>
Reviewed-by: Samuli Piippo <samuli.piippo@digia.com>
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/configure/tools.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
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<QString,QString> &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); |