aboutsummaryrefslogtreecommitdiff
path: root/package/qt5/qt5declarative
diff options
context:
space:
mode:
authorGravatar Fatih Aşıcı <fatih.asici@gmail.com>2015-01-22 14:37:57 +0200
committerGravatar Peter Korsgaard <peter@korsgaard.com>2015-02-02 21:47:39 +0100
commit9fff65cf1a1278702b5c9a5fb63e0cec583ab593 (patch)
treea3ac993acea88bb39da85e8bf861e44c2a24ce4e /package/qt5/qt5declarative
parent59a962af7a8ef15b97724c421b8658a030e308ac (diff)
downloadbuildroot-9fff65cf1a1278702b5c9a5fb63e0cec583ab593.tar.gz
buildroot-9fff65cf1a1278702b5c9a5fb63e0cec583ab593.tar.bz2
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/qt5declarative')
-rw-r--r--package/qt5/qt5declarative/qt5declarative.hash8
-rw-r--r--package/qt5/qt5declarative/qt5declarative.mk5
2 files changed, 6 insertions, 7 deletions
diff --git a/package/qt5/qt5declarative/qt5declarative.hash b/package/qt5/qt5declarative/qt5declarative.hash
index 38e1d51b93..23dfb598f3 100644
--- a/package/qt5/qt5declarative/qt5declarative.hash
+++ b/package/qt5/qt5declarative/qt5declarative.hash
@@ -1,4 +1,4 @@
-# Hashes from: http://download.qt-project.org/official_releases/qt/5.3/5.3.2/submodules/qtdeclarative-opensource-src-5.3.2.tar.xz.mirrorlist
-sha256 04108193b9642c0394c157e98b5c1d81f555f9f495289e07ebfb6f03448b2382 qtdeclarative-opensource-src-5.3.2.tar.xz
-sha1 595ce2eabd771ae2ead968220f9d8e1ff14fafa8 qtdeclarative-opensource-src-5.3.2.tar.xz
-md5 72ae60527ebb15f4b85cfbadc4c174de qtdeclarative-opensource-src-5.3.2.tar.xz
+# Hashes from: http://download.qt-project.org/official_releases/qt/5.4/5.4.0/submodules/qtdeclarative-opensource-src-5.4.0.tar.xz.mirrorlist
+sha256 e67c9275b0f6869a7c1e8023ad7c0a23fb19f8a8d2f350371e954ead0cfad7b6 qtdeclarative-opensource-src-5.4.0.tar.xz
+sha1 12c12d50c71cfb1f18c7fabfabe4ad4b364b09fe qtdeclarative-opensource-src-5.4.0.tar.xz
+md5 4f928e52e72b5e867b50b4d409d5e99b qtdeclarative-opensource-src-5.4.0.tar.xz
diff --git a/package/qt5/qt5declarative/qt5declarative.mk b/package/qt5/qt5declarative/qt5declarative.mk
index 19288014ef..30c0813f06 100644
--- a/package/qt5/qt5declarative/qt5declarative.mk
+++ b/package/qt5/qt5declarative/qt5declarative.mk
@@ -11,8 +11,8 @@ QT5DECLARATIVE_DEPENDENCIES = qt5base qt5xmlpatterns
QT5DECLARATIVE_INSTALL_STAGING = YES
ifeq ($(BR2_PACKAGE_QT5BASE_LICENSE_APPROVED),y)
-QT5DECLARATIVE_LICENSE = LGPLv2.1 or GPLv3.0
-QT5DECLARATIVE_LICENSE_FILES = LICENSE.GPL LICENSE.LGPL LGPL_EXCEPTION.txt
+QT5DECLARATIVE_LICENSE = LGPLv2.1 with exception or LGPLv3 or GPLv2
+QT5DECLARATIVE_LICENSE_FILES = LICENSE.LGPLv21 LGPL_EXCEPTION.txt LICENSE.LGPLv3 LICENSE.GPLv2
else
QT5DECLARATIVE_LICENSE = Commercial license
QT5DECLARATIVE_REDISTRIBUTE = NO
@@ -39,7 +39,6 @@ ifeq ($(BR2_STATIC_LIBS),)
ifeq ($(BR2_PACKAGE_QT5DECLARATIVE_QUICK),y)
define QT5DECLARATIVE_INSTALL_TARGET_QUICK_LIBS
cp -dpf $(STAGING_DIR)/usr/lib/libQt5Quick*.so.* $(TARGET_DIR)/usr/lib
- cp -dpfr $(STAGING_DIR)/usr/lib/qt/plugins/accessible $(TARGET_DIR)/usr/lib/qt/plugins
endef
endif