diff options
Diffstat (limited to 'meta/recipes-qt/qt5/qtquickcontrols_git.bb')
| -rw-r--r-- | meta/recipes-qt/qt5/qtquickcontrols_git.bb | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/meta/recipes-qt/qt5/qtquickcontrols_git.bb b/meta/recipes-qt/qt5/qtquickcontrols_git.bb index 17dd0fc1d0..95d205f864 100644 --- a/meta/recipes-qt/qt5/qtquickcontrols_git.bb +++ b/meta/recipes-qt/qt5/qtquickcontrols_git.bb @@ -1,20 +1,22 @@ require qt5.inc require qt5-git.inc -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 )" +LICENSE = "GFDL-1.3 & BSD & LGPL-3.0 | GPL-2.0" LIC_FILES_CHKSUM = " \ - file://LICENSE.LGPL3;md5=e6a600fd5e1d9cbde2d983680233ad02 \ - file://LICENSE.GPL2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ - file://LICENSE.GPL3;md5=d32239bcb673463ab874e80d47fae504 \ - file://LICENSE.GPL3-EXCEPT;md5=763d8c535a234d9a3fb682c7ecb6c073 \ + file://LICENSE.LGPLv3;md5=e0459b45c5c4840b353141a8bbed91f0 \ + file://LICENSE.GPLv2;md5=c96076271561b0e3785dad260634eaa8 \ + file://LICENSE.GPLv3;md5=88e2b9117e6be406b5ed6ee4ca99a705 \ file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \ " DEPENDS += "qtdeclarative" -FILES_${PN}-qmlplugins += " \ - ${OE_QMAKE_PATH_QML}/QtQuick/Controls/Shaders \ - ${OE_QMAKE_PATH_QML}/QtQuick/Dialogs/qml/icons.ttf \ +RDEPENDS_${PN}-dev = "" + +# Patches from https://github.com/meta-qt5/qtquickcontrols/commits/b5.6 +# 5.6.meta-qt5.1 +SRC_URI += " \ + file://0001-texteditor-fix-invalid-use-of-incomplete-type-class-.patch \ " -SRCREV = "09ebb25aa686fc3f47f860905c2abb32a95c75d1" +SRCREV = "b66f6b05c5f8024ddd9f8c46f33ccb618323999e" |