From 3c070b58b29a4ff4ea8cdc913a1e236042ee4fda Mon Sep 17 00:00:00 2001
From: Kalle Viironen <kalle.viironen@digia.com>
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 <miikka.heikkinen@digia.com>
Reviewed-by: Samuli Piippo <samuli.piippo@digia.com>
---
 configure                 | 3 ++-
 tools/configure/tools.cpp | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/configure b/configure
index 52588c39d2..3fe8d43cf0 100755
--- a/configure
+++ b/configure
@@ -2773,7 +2773,8 @@ if [ -f "$relpath"/LICENSE.PREVIEW.COMMERCIAL ] && [ $COMMERCIAL_USER = "yes" ];
     EditionString="Technology Preview"
 elif [ $COMMERCIAL_USER = "yes" ]; 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
             exit 1
         else
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);
-- 
cgit v1.2.3