From 9fff65cf1a1278702b5c9a5fb63e0cec583ab593 Mon Sep 17 00:00:00 2001 From: Fatih Aşıcı Date: Thu, 22 Jan 2015 14:37:57 +0200 Subject: qt5: bump to version 5.4.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit qt5base: - Add patches to fix uClibc build. qt5connectivity: - Add patches to fix build with -no-c++11 qt5declarative: - Remove the line that installs accessible plugin. The functionality is moved into the qtquick library. qt5webkit: - Remove egl patch. This should be fixed with CONFIG += egl option. qt5websockets: - Remove upstreamed patch. Changelogs: https://qt-project.org/wiki/Change-files-in-Qt-5.4.0 Signed-off-by: Fatih Aşıcı Signed-off-by: Peter Korsgaard --- package/qt5/qt5script/qt5script.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'package/qt5/qt5script/qt5script.mk') diff --git a/package/qt5/qt5script/qt5script.mk b/package/qt5/qt5script/qt5script.mk index 18067fd34c..7f0efbb57e 100644 --- a/package/qt5/qt5script/qt5script.mk +++ b/package/qt5/qt5script/qt5script.mk @@ -11,8 +11,8 @@ QT5SCRIPT_DEPENDENCIES = qt5base QT5SCRIPT_INSTALL_STAGING = YES ifeq ($(BR2_PACKAGE_QT5BASE_LICENSE_APPROVED),y) -QT5SCRIPT_LICENSE = LGPLv2.1 or GPLv3.0 -QT5SCRIPT_LICENSE_FILES = LICENSE.GPL LICENSE.LGPL LGPL_EXCEPTION.txt +QT5SCRIPT_LICENSE = LGPLv2.1 with exception or LGPLv3 or GPLv2 +QT5SCRIPT_LICENSE_FILES = LICENSE.LGPLv21 LGPL_EXCEPTION.txt LICENSE.LGPLv3 LICENSE.GPLv2 else QT5SCRIPT_LICENSE = Commercial license QT5SCRIPT_REDISTRIBUTE = NO -- cgit v1.2.3