diff options
author | Samuli Piippo <samuli.piippo@qt.io> | 2016-08-23 13:28:36 +0300 |
---|---|---|
committer | Samuli Piippo <samuli.piippo@qt.io> | 2016-08-23 16:37:11 +0300 |
commit | 7a2707393eccad021763cd9a4294e471883b8590 (patch) | |
tree | 713154f6563edc827a610793baa5a33c6b088a53 /recipes-qt/qt5/qtgraphicaleffects_git.bb | |
parent | 0fc7aeb1cbe2c63e24ce6ef06d290ac586133c2e (diff) | |
parent | d9cd5ede502ddf04767d5531340b12050ee7f899 (diff) |
Merge remote-tracking branch 'meta-qt5/master' into 5.7
* meta-qt5/master:
qtbase: fix drm dependency for eglfs PACKAGECONFIG
qt5: upgrade to latest revisions in 5.7 branch
qt5-opengles2-test: remove
cmake_qt5.bbclass: when using _prepend don't forget to add space at the end
qtquick1: fix qtwebkit support
qtbase: add PACKAGECONFIG for journald logging
qtserialbus: add recipe
qtwayland: Rework recipe to allow PACKAGECONFIG use
qtwayland: add dependency on libxcomposite
qtcharts: Add dependency on qtmultimedia
packagegroup-qt5-toolchain-target.bb: Add qtdeclarative-tools to RDEPENDS.
Conflicts:
classes/qmake5_base.bbclass
recipes-qt/qt5/nativesdk-qtbase_git.bb
recipes-qt/qt5/qt3d_git.bb
recipes-qt/qt5/qtbase-native_git.bb
recipes-qt/qt5/qtbase/0002-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch
recipes-qt/qt5/qtbase/0003-Add-external-hostbindir-option.patch
recipes-qt/qt5/qtbase/0012-Add-external-hostbindir-option-for-native-sdk.patch
recipes-qt/qt5/qtbase_git.bb
recipes-qt/qt5/qtconnectivity_git.bb
recipes-qt/qt5/qtdeclarative_git.bb
recipes-qt/qt5/qtimageformats_git.bb
recipes-qt/qt5/qtlocation_git.bb
recipes-qt/qt5/qtmultimedia_git.bb
recipes-qt/qt5/qtquick1_git.bb
recipes-qt/qt5/qtquickcontrols2_git.bb
recipes-qt/qt5/qtquickcontrols_git.bb
recipes-qt/qt5/qtsensors_git.bb
recipes-qt/qt5/qtserialport_git.bb
recipes-qt/qt5/qtsystems_git.bb
recipes-qt/qt5/qttools_git.bb
recipes-qt/qt5/qttranslations_git.bb
recipes-qt/qt5/qtwayland-native_git.bb
recipes-qt/qt5/qtwayland_git.bb
recipes-qt/qt5/qtwebengine_git.bb
recipes-qt/qt5/qtxmlpatterns_git.bb
Change-Id: Ia3d047984b6249526d6bf14373114d0fc734c458
Diffstat (limited to 'recipes-qt/qt5/qtgraphicaleffects_git.bb')
-rw-r--r-- | recipes-qt/qt5/qtgraphicaleffects_git.bb | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/recipes-qt/qt5/qtgraphicaleffects_git.bb b/recipes-qt/qt5/qtgraphicaleffects_git.bb index 1ecc4f70..6c62a683 100644 --- a/recipes-qt/qt5/qtgraphicaleffects_git.bb +++ b/recipes-qt/qt5/qtgraphicaleffects_git.bb @@ -1,20 +1,22 @@ require qt5.inc require qt5-git.inc -# There are no LGPLv3-only licensed files in this component. -# There are no GPLv2 licensed files in this component. -LICENSE = "GFDL-1.3 & BSD & (LGPL-2.1 & The-Qt-Company-Qt-LGPL-Exception-1.1 | LGPL-3.0)" +LICENSE = "GFDL-1.3 & BSD & ( GPL-3.0 & The-Qt-Company-GPL-Exception-1.0 | The-Qt-Company-Commercial ) & ( GPL-2.0+ | LGPL-3.0 | The-Qt-Company-Commercial )" LIC_FILES_CHKSUM = " \ + file://LICENSE.LGPL3;md5=e6a600fd5e1d9cbde2d983680233ad02 \ file://LICENSE.LGPLv21;md5=58a180e1cf84c756c29f782b3a485c29 \ file://LICENSE.LGPLv3;md5=b8c75190712063cde04e1f41b6fdad98 \ + file://LICENSE.GPL2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ + file://LICENSE.GPL3;md5=d32239bcb673463ab874e80d47fae504 \ + file://LICENSE.GPL3-EXCEPT;md5=763d8c535a234d9a3fb682c7ecb6c073 \ + file://LICENSE.GPLv2;md5=05832301944453ec79e40ba3c3cfceec \ file://LICENSE.GPLv3;md5=40f9bf30e783ddc201497165dfb32afb \ file://LGPL_EXCEPTION.txt;md5=9625233da42f9e0ce9d63651a9d97654 \ file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \ - file://LICENSE.GPLv2;md5=05832301944453ec79e40ba3c3cfceec \ " DEPENDS += "qtdeclarative" RDEPENDS_${PN}-dev = "" -SRCREV = "d85fd81f338f9c6f2e95b92b2cb9ccd4f9889c6b" +SRCREV = "d3023be0d839440ac046adf2af75d9e4306dd5ef" |