diff options
| author | Fatih Aşıcı <fatih.asici@gmail.com> | 2015-01-22 14:37:57 +0200 |
|---|---|---|
| committer | Peter Korsgaard <peter@korsgaard.com> | 2015-02-02 21:47:39 +0100 |
| commit | 9fff65cf1a1278702b5c9a5fb63e0cec583ab593 (patch) | |
| tree | a3ac993acea88bb39da85e8bf861e44c2a24ce4e /package/qt5/qt5imageformats | |
| parent | 59a962af7a8ef15b97724c421b8658a030e308ac (diff) | |
| download | buildroot-9fff65cf1a1278702b5c9a5fb63e0cec583ab593.tar.gz buildroot-9fff65cf1a1278702b5c9a5fb63e0cec583ab593.zip | |
qt5: bump to version 5.4.0
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ı <fatih.asici@gmail.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
Diffstat (limited to 'package/qt5/qt5imageformats')
| -rw-r--r-- | package/qt5/qt5imageformats/qt5imageformats.hash | 8 | ||||
| -rw-r--r-- | package/qt5/qt5imageformats/qt5imageformats.mk | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/package/qt5/qt5imageformats/qt5imageformats.hash b/package/qt5/qt5imageformats/qt5imageformats.hash index 8465b6b6f2..9ab01068ec 100644 --- a/package/qt5/qt5imageformats/qt5imageformats.hash +++ b/package/qt5/qt5imageformats/qt5imageformats.hash @@ -1,4 +1,4 @@ -# Hashes from: http://download.qt-project.org/official_releases/qt/5.3/5.3.2/submodules/qtimageformats-opensource-src-5.3.2.tar.xz.mirrorlist -sha256 d303cbceb73774edc0cfdbde6b97b0e41077e242ff6520710890f81bea40e2d4 qtimageformats-opensource-src-5.3.2.tar.xz -sha1 4b8068f4f958d0c637b86638219c006990ae0efa qtimageformats-opensource-src-5.3.2.tar.xz -md5 255bb7f28c667ab91303e6af271753b5 qtimageformats-opensource-src-5.3.2.tar.xz +# Hashes from: http://download.qt-project.org/official_releases/qt/5.4/5.4.0/submodules/qtimageformats-opensource-src-5.4.0.tar.xz.mirrorlist +sha256 c89b678df71e44f8cff7b5f8362b7d61430a7aa7cd70147be1267d87ac8fe046 qtimageformats-opensource-src-5.4.0.tar.xz +sha1 6590b61c51a186837c3d2058d8192886d970f92a qtimageformats-opensource-src-5.4.0.tar.xz +md5 608dbe53d5d3a0872eb20025b681d1dc qtimageformats-opensource-src-5.4.0.tar.xz diff --git a/package/qt5/qt5imageformats/qt5imageformats.mk b/package/qt5/qt5imageformats/qt5imageformats.mk index 4126f9f117..0703db0886 100644 --- a/package/qt5/qt5imageformats/qt5imageformats.mk +++ b/package/qt5/qt5imageformats/qt5imageformats.mk @@ -11,8 +11,8 @@ QT5IMAGEFORMATS_DEPENDENCIES = qt5base QT5IMAGEFORMATS_INSTALL_STAGING = YES ifeq ($(BR2_PACKAGE_QT5BASE_LICENSE_APPROVED),y) -QT5IMAGEFORMATS_LICENSE = LGPLv2.1 or GPLv3.0 -QT5IMAGEFORMATS_LICENSE_FILES = LICENSE.GPL LICENSE.LGPL LGPL_EXCEPTION.txt +QT5IMAGEFORMATS_LICENSE = LGPLv2.1 with exception or LGPLv3 or GPLv2 +QT5IMAGEFORMATS_LICENSE_FILES = LICENSE.LGPLv21 LGPL_EXCEPTION.txt LICENSE.LGPLv3 LICENSE.GPLv2 else QT5IMAGEFORMATS_LICENSE = Commercial license QT5IMAGEFORMATS_REDISTRIBUTE = NO |
