summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYann E. MORIN <yann.morin.1998@free.fr>2017-04-23 22:31:13 +0200
committerThomas Petazzoni <thomas.petazzoni@free-electrons.com>2017-04-29 15:53:51 +0200
commita16e8bd7bdb09ba9affaec7098d772999848ede3 (patch)
tree0a1895fe7d9bdfc66ead68b6b233016998c7c2ce
parent288288e0c1790ec4f07648a2b8a7229fd7b2615c (diff)
downloadbuildroot-a16e8bd7bdb09ba9affaec7098d772999848ede3.tar.gz
buildroot-a16e8bd7bdb09ba9affaec7098d772999848ede3.zip
package/qt5x11extras: 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 qt5x11extras 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/qt5/qt5x11extras/qt5x11extras.mk5
1 files changed, 0 insertions, 5 deletions
diff --git a/package/qt5/qt5x11extras/qt5x11extras.mk b/package/qt5/qt5x11extras/qt5x11extras.mk
index 7dc371cbac..00667c72f3 100644
--- a/package/qt5/qt5x11extras/qt5x11extras.mk
+++ b/package/qt5/qt5x11extras/qt5x11extras.mk
@@ -10,7 +10,6 @@ QT5X11EXTRAS_SOURCE = qtx11extras-opensource-src-$(QT5X11EXTRAS_VERSION).tar.xz
QT5X11EXTRAS_DEPENDENCIES = qt5base
QT5X11EXTRAS_INSTALL_STAGING = YES
-ifeq ($(BR2_PACKAGE_QT5BASE_LICENSE_APPROVED),y)
ifeq ($(BR2_PACKAGE_QT5_VERSION_LATEST),y)
QT5X11EXTRAS_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0 with exception(tools), GFDL-1.3 (docs)
QT5X11EXTRAS_LICENSE_FILES = LICENSE.GPLv2 LICENSE.GPLv3 LICENSE.GPL3-EXCEPT LICENSE.LGPLv3 LICENSE.FDL
@@ -18,10 +17,6 @@ else
QT5X11EXTRAS_LICENSE = GPL-2.0 or GPL-3.0 or LGPL-2.1 with exception or LGPL-3.0, GFDL-1.3 (docs)
QT5X11EXTRAS_LICENSE_FILES = LICENSE.GPLv2 LICENSE.GPLv3 LICENSE.LGPLv21 LGPL_EXCEPTION.txt LICENSE.LGPLv3 LICENSE.FDL
endif
-else
-QT5X11EXTRAS_LICENSE = Commercial license
-QT5X11EXTRAS_REDISTRIBUTE = NO
-endif
define QT5X11EXTRAS_CONFIGURE_CMDS
(cd $(@D); $(TARGET_MAKE_ENV) $(HOST_DIR)/usr/bin/qmake)
OpenPOWER on IntegriCloud