diff options
author | Martin Jansa <Martin.Jansa@gmail.com> | 2016-07-27 17:25:07 +0200 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2016-08-05 11:03:12 +0200 |
commit | 1a42aa78af040d0fbecc960e4f9dd3f180ccb404 (patch) | |
tree | 8f824b3548f0af18b91ed4737b72bdf8a2bed7e1 /recipes-qt/qt5/qtwebengine_git.bb | |
parent | 85694b94aa0b1e536eda13e7239720bca114b000 (diff) | |
download | meta-qt5-1a42aa78af040d0fbecc960e4f9dd3f180ccb404.tar.gz |
qt5: upgrade to latest revisions in 5.7 branch
* LIC_FILES_CHKSUM were changed because of this small change:
commit 4343c4e731c3268614fc79c9c42b4e5e4d59d7e6
Author: Sze Howe Koh <szehowe.koh@gmail.com>
Date: Tue Jun 14 19:12:35 2016 +0800
Expand license scope from "Qt GUI Toolkit" to "Qt Toolkit"
* -no-nis option was removed from qtbase in:
commit 644d0e75240811212ed9fd0c21e3bd05db3ba5db
Author: Ralf Nolden <nolden@kde.org>
Date: Fri May 20 22:03:39 2016 +0200
Cleanup NIS support leftover from Qt 3/4
* allow to disable eglfs independently from gles2, because eglfs-egldevice
may be autodetected when libdrm was built before qtbase since this
upstream commit:
commit 5c6d27b8dfa695ab04766a1711b00421dba9c7d0
Author: Ralf Nolden <nolden@kde.org>
Date: Tue May 17 12:38:44 2016 +0200
Make eglfs-egldevice check work with pkgconfig as well
and then it fails to build, because libdrm could be removed from sysroot
and drm.h is missing.
* recipes-qt/qt5/qtquick1/0001-qdeclarativetextinput-update-to-match-QWidgetLineCon.patch
was resolved in upstream commit:
commit 26229cfa0b729313893af5674d604e8692dbb946
Author: Richard Moe Gustavsen <richard.gustavsen@theqtcompany.com>
Date: Tue Apr 26 15:08:34 2016 +0200
QDeclarativeTextInput: update API to use setBlinkingCursorEnabled
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'recipes-qt/qt5/qtwebengine_git.bb')
-rw-r--r-- | recipes-qt/qt5/qtwebengine_git.bb | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/recipes-qt/qt5/qtwebengine_git.bb b/recipes-qt/qt5/qtwebengine_git.bb index 48c955cc..aedd1417 100644 --- a/recipes-qt/qt5/qtwebengine_git.bb +++ b/recipes-qt/qt5/qtwebengine_git.bb | |||
@@ -5,8 +5,8 @@ LICENSE = "LGPL-3.0 & BSD & GPL-3.0 & The-Qt-Company-GPL-Exception-1.0" | |||
5 | LIC_FILES_CHKSUM = " \ | 5 | LIC_FILES_CHKSUM = " \ |
6 | file://src/core/browser_context_qt.cpp;md5=b5193b7d68699260f3b40b201365c8d2;beginline=1;endline=38 \ | 6 | file://src/core/browser_context_qt.cpp;md5=b5193b7d68699260f3b40b201365c8d2;beginline=1;endline=38 \ |
7 | file://src/3rdparty/chromium/LICENSE;md5=0fca02217a5d49a14dfe2d11837bb34d \ | 7 | file://src/3rdparty/chromium/LICENSE;md5=0fca02217a5d49a14dfe2d11837bb34d \ |
8 | file://LICENSE.LGPL3;md5=3dcffeed712d3c916f9a2d9135703aff \ | 8 | file://LICENSE.LGPL3;md5=8211fde12cc8a4e2477602f5953f5b71 \ |
9 | file://LICENSE.GPLv3;md5=40f9bf30e783ddc201497165dfb32afb \ | 9 | file://LICENSE.GPLv3;md5=88e2b9117e6be406b5ed6ee4ca99a705 \ |
10 | file://LICENSE.GPL3;md5=d32239bcb673463ab874e80d47fae504 \ | 10 | file://LICENSE.GPL3;md5=d32239bcb673463ab874e80d47fae504 \ |
11 | file://LICENSE.GPL3-EXCEPT;md5=763d8c535a234d9a3fb682c7ecb6c073 \ | 11 | file://LICENSE.GPL3-EXCEPT;md5=763d8c535a234d9a3fb682c7ecb6c073 \ |
12 | file://LICENSE.GPL2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ | 12 | file://LICENSE.GPL2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ |
@@ -122,8 +122,10 @@ SRC_URI += " \ | |||
122 | 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 \ |
123 | " | 123 | " |
124 | 124 | ||
125 | SRCREV_qtwebengine = "63cf26268996ae5580c77095a252696fa549b593" | 125 | SRCREV_qtwebengine = "dbf7dd27428ff755444eac5e975cb69802ac9771" |
126 | SRCREV_chromium = "ba40ed24a6d23e606397b650a7982b0998dbeaf4" | 126 | # This is in git submodule, but we're using the latest in 49-based |
127 | # SRCREV_chromium = "c109a95a067af783e48f93d1cdeca870cda98878" | ||
128 | SRCREV_chromium = "29c16917b33c26ad32893fa05af971c6c6f50297" | ||
127 | SRCREV = "${SRCREV_qtwebengine}" | 129 | SRCREV = "${SRCREV_qtwebengine}" |
128 | 130 | ||
129 | SRCREV_FORMAT = "qtwebengine_chromium" | 131 | SRCREV_FORMAT = "qtwebengine_chromium" |