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/qt5webkit-examples/qt5webkit-examples.mk | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'package/qt5/qt5webkit-examples/qt5webkit-examples.mk') diff --git a/package/qt5/qt5webkit-examples/qt5webkit-examples.mk b/package/qt5/qt5webkit-examples/qt5webkit-examples.mk index b3b9fbef18..b687ac70c5 100644 --- a/package/qt5/qt5webkit-examples/qt5webkit-examples.mk +++ b/package/qt5/qt5webkit-examples/qt5webkit-examples.mk @@ -10,10 +10,10 @@ QT5WEBKIT_EXAMPLES_SOURCE = qtwebkit-examples-opensource-src-$(QT5WEBKIT_EXAMPLE QT5WEBKIT_EXAMPLES_DEPENDENCIES = qt5webkit ifeq ($(BR2_PACKAGE_QT5BASE_LICENSE_APPROVED),y) -QT5WEBKIT_EXAMPLES_LICENSE = LGPLv2.1 or GPLv3.0 -# Here we would like to get license files from qt5base, but qt5base -# may not be extracted at the time we get the legal-info for -# qt5webkit-examples. +QT5WEBKIT_EXAMPLES_LICENSE = LGPLv2.1 with exception or LGPLv3 or GPLv2 +# Source files contain references to LGPL_EXCEPTION.txt but it is not included +# in the archive. +QT5WEBKIT_EXAMPLES_LICENSE_FILES = LICENSE.LGPLv21 LICENSE.LGPLv3 LICENSE.GPLv2 else QT5WEBKIT_EXAMPLES_LICENSE = Commercial license QT5WEBKIT_EXAMPLES_REDISTRIBUTE = NO -- cgit v1.2.3