aboutsummaryrefslogtreecommitdiffstats
path: root/recipes-qt/qt5/qtquick1_git.bb
diff options
context:
space:
mode:
Diffstat (limited to 'recipes-qt/qt5/qtquick1_git.bb')
-rw-r--r--recipes-qt/qt5/qtquick1_git.bb16
1 files changed, 6 insertions, 10 deletions
diff --git a/recipes-qt/qt5/qtquick1_git.bb b/recipes-qt/qt5/qtquick1_git.bb
index 55179fa6..4107c3a3 100644
--- a/recipes-qt/qt5/qtquick1_git.bb
+++ b/recipes-qt/qt5/qtquick1_git.bb
@@ -1,23 +1,19 @@
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.
-# Note that some files are LGPL-2.1 only without The-Qt-Company-Qt-LGPL-Exception-1.1.
-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.LGPLv21;md5=58a180e1cf84c756c29f782b3a485c29 \
- file://LICENSE.LGPLv3;md5=c4fe8c6de4eef597feec6e90ed62e962 \
+ file://LICENSE.LGPLv21;md5=4bfd28363f541b10d9f024181b8df516 \
+ file://LICENSE.LGPLv3;md5=e0459b45c5c4840b353141a8bbed91f0 \
+ file://LICENSE.GPLv2;md5=c96076271561b0e3785dad260634eaa8 \
+ file://LICENSE.GPLv3;md5=88e2b9117e6be406b5ed6ee4ca99a705 \
file://LGPL_EXCEPTION.txt;md5=9625233da42f9e0ce9d63651a9d97654 \
file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \
- file://LICENSE.GPLv2;md5=05832301944453ec79e40ba3c3cfceec \
"
DEPENDS += "qtscript qtsvg qtxmlpatterns"
# qttools
-SRC_URI += "file://0001-qdeclarativetextinput-update-to-match-QWidgetLineCon.patch"
-
PACKAGECONFIG ??= "webkit"
PACKAGECONFIG[webkit] = ",,qtwebkit"
@@ -27,4 +23,4 @@ do_configure_prepend() {
sed -i 's#^qtHaveModule(webkitwidgets):#qtHaveModule(webkitwidgets):!contains(CONFIG, noqtwebkit):#g' ${S}/src/imports/imports.pro
}
-SRCREV = "5e3bd5cb28e7af95b289a617ca2f7a8892498225"
+SRCREV = "857fc5ec4644a6111ba8725e4e1a84dd5ea6bfca"