diff options
Diffstat (limited to 'recipes-qt/qt5/qtwebengine_git.bb')
-rw-r--r-- | recipes-qt/qt5/qtwebengine_git.bb | 19 |
1 files changed, 11 insertions, 8 deletions
diff --git a/recipes-qt/qt5/qtwebengine_git.bb b/recipes-qt/qt5/qtwebengine_git.bb index 427cd958..48c955cc 100644 --- a/recipes-qt/qt5/qtwebengine_git.bb +++ b/recipes-qt/qt5/qtwebengine_git.bb | |||
@@ -1,12 +1,15 @@ | |||
1 | SUMMARY = "QtWebEngine combines the power of Chromium and Qt" | 1 | SUMMARY = "QtWebEngine combines the power of Chromium and Qt" |
2 | 2 | ||
3 | LICENSE = "LGPL-3.0 & BSD" | 3 | # Read http://blog.qt.io/blog/2016/01/13/new-agreement-with-the-kde-free-qt-foundation/ |
4 | LICENSE = "LGPL-3.0 & BSD & GPL-3.0 & The-Qt-Company-GPL-Exception-1.0" | ||
4 | LIC_FILES_CHKSUM = " \ | 5 | LIC_FILES_CHKSUM = " \ |
5 | file://src/core/browser_context_qt.cpp;md5=5fe719c44250955a5d5f8fb15fc8b1da;beginline=1;endline=35 \ | 6 | file://src/core/browser_context_qt.cpp;md5=b5193b7d68699260f3b40b201365c8d2;beginline=1;endline=38 \ |
6 | file://src/3rdparty/chromium/LICENSE;md5=537e0b52077bf0a616d0a0c8a79bc9d5 \ | 7 | file://src/3rdparty/chromium/LICENSE;md5=0fca02217a5d49a14dfe2d11837bb34d \ |
7 | file://LICENSE.LGPLv3;md5=3dcffeed712d3c916f9a2d9135703aff \ | 8 | file://LICENSE.LGPL3;md5=3dcffeed712d3c916f9a2d9135703aff \ |
8 | file://LICENSE.GPLv3;md5=40f9bf30e783ddc201497165dfb32afb \ | 9 | file://LICENSE.GPLv3;md5=40f9bf30e783ddc201497165dfb32afb \ |
9 | file://LICENSE.GPLv2;md5=05832301944453ec79e40ba3c3cfceec \ | 10 | file://LICENSE.GPL3;md5=d32239bcb673463ab874e80d47fae504 \ |
11 | file://LICENSE.GPL3-EXCEPT;md5=763d8c535a234d9a3fb682c7ecb6c073 \ | ||
12 | file://LICENSE.GPL2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ | ||
10 | " | 13 | " |
11 | 14 | ||
12 | DEPENDS += " \ | 15 | DEPENDS += " \ |
@@ -106,7 +109,7 @@ RDEPENDS_${PN}-examples += " \ | |||
106 | qtdeclarative-qmlplugins \ | 109 | qtdeclarative-qmlplugins \ |
107 | " | 110 | " |
108 | 111 | ||
109 | QT_MODULE_BRANCH_CHROMIUM = "45-based" | 112 | QT_MODULE_BRANCH_CHROMIUM = "49-based" |
110 | 113 | ||
111 | SRC_URI += " \ | 114 | SRC_URI += " \ |
112 | ${QT_GIT}/qtwebengine-chromium.git;name=chromium;branch=${QT_MODULE_BRANCH_CHROMIUM};destsuffix=git/src/3rdparty \ | 115 | ${QT_GIT}/qtwebengine-chromium.git;name=chromium;branch=${QT_MODULE_BRANCH_CHROMIUM};destsuffix=git/src/3rdparty \ |
@@ -119,8 +122,8 @@ SRC_URI += " \ | |||
119 | file://0002-chromium-Change-false-to-FALSE-and-1-to-TRUE-FIX-qtw.patch \ | 122 | file://0002-chromium-Change-false-to-FALSE-and-1-to-TRUE-FIX-qtw.patch \ |
120 | " | 123 | " |
121 | 124 | ||
122 | SRCREV_qtwebengine = "643aa579fc94933eefa8eb20af6729e2140cf480" | 125 | SRCREV_qtwebengine = "63cf26268996ae5580c77095a252696fa549b593" |
123 | SRCREV_chromium = "8252b18aa3efa52138e91f9756945afb142a1c8c" | 126 | SRCREV_chromium = "ba40ed24a6d23e606397b650a7982b0998dbeaf4" |
124 | SRCREV = "${SRCREV_qtwebengine}" | 127 | SRCREV = "${SRCREV_qtwebengine}" |
125 | 128 | ||
126 | SRCREV_FORMAT = "qtwebengine_chromium" | 129 | SRCREV_FORMAT = "qtwebengine_chromium" |