summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYann E. MORIN <yann.morin.1998@free.fr>2017-04-23 22:30:51 +0200
committerThomas Petazzoni <thomas.petazzoni@free-electrons.com>2017-04-29 15:53:18 +0200
commit25ca4b24b32b3b8e327c1c6aeefc1eb85cc145fb (patch)
treef9f810c71ec1ee1d71de696b65ffabfb62e91920
parentce79e0b2306302f50663d587cd423ea427f6f8cb (diff)
downloadbuildroot-25ca4b24b32b3b8e327c1c6aeefc1eb85cc145fb.tar.gz
buildroot-25ca4b24b32b3b8e327c1c6aeefc1eb85cc145fb.zip
package/qt: always use the opensource license
We never ask the user to confirm their assent about the use of a free license; there is no reason we do so for Qt. The output of legal-info is there to gather all the licenses used in a build; the license for Qt will be there to be consulted as well. Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr> Cc: Julien Corjon <corjon.j@ecagroup.com> Cc: Peter Seiderer <ps.report@gmx.net> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
-rw-r--r--package/qt/qt.mk6
1 files changed, 1 insertions, 5 deletions
diff --git a/package/qt/qt.mk b/package/qt/qt.mk
index 690a4b4d9e..8b52208148 100644
--- a/package/qt/qt.mk
+++ b/package/qt/qt.mk
@@ -15,14 +15,10 @@ QT_DEPENDENCIES = host-pkgconf
QT_INSTALL_STAGING = YES
QT_LICENSE := LGPL-2.1 with exceptions or GPL-3.0
-ifneq ($(BR2_PACKAGE_QT_LICENSE_APPROVED),y)
-QT_LICENSE := $(QT_LICENSE) or Digia Qt Commercial license
-endif
QT_LICENSE_FILES = LICENSE.LGPL LGPL_EXCEPTION.txt LICENSE.GPL3
-ifeq ($(BR2_PACKAGE_QT_LICENSE_APPROVED),y)
+# Opensource licenses are the only one we catter about
QT_CONFIGURE_OPTS += -opensource -confirm-license
-endif
QT_CONFIG_FILE = $(call qstrip,$(BR2_PACKAGE_QT_CONFIG_FILE))
OpenPOWER on IntegriCloud