diff options
| author | Samuli Piippo <samuli.piippo@qt.io> | 2016-08-18 16:43:50 +0300 |
|---|---|---|
| committer | Samuli Piippo <samuli.piippo@qt.io> | 2016-08-19 11:17:41 +0300 |
| commit | c433b617de5e5363b252a80240f053b103e35e01 (patch) | |
| tree | b85b0504d707cfb17ba6ce9989f4270e4f718010 /recipes-qt/qt5/qtwebengine_git.bb | |
| parent | ce9a8d9537e3baa7d485128a3f41451d7dca7770 (diff) | |
| parent | ccae79be69c5268df3b47e4e14cea0591c39a531 (diff) | |
Merge remote-tracking branch 'meta-qt5/krogoth' into master-mingw
* meta-qt5/krogoth:
qtquick1: fix qtwebkit support
qtbase: fix drm dependency for eglfs PACKAGECONFIG
cmake_qt5.bbclass: when using _prepend don't forget to add space at the end
qt5: upgrade to latest revisions in 5.6 branch
qtbase: add patch to make Qt5Config modules behave better with cmake builds
cmake_qt5: prepend the Qt5 specific CMake variables to EXTRA_OECMAKE
Change dependency from virtual/mesa to drm in the kms packageconfig.
replace base_contains by bb.utils.contains
Conflicts:
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/0011-Add-external-hostbindir-option-for-native-sdk.patch
recipes-qt/qt5/qtbase_git.bb
recipes-qt/qt5/qtcanvas3d_git.bb
recipes-qt/qt5/qtconnectivity_git.bb
recipes-qt/qt5/qtdeclarative_git.bb
recipes-qt/qt5/qtenginio_git.bb
recipes-qt/qt5/qtgraphicaleffects_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/qtquickcontrols/0001-texteditor-fix-invalid-use-of-incomplete-type-class-.patch
recipes-qt/qt5/qtquickcontrols2_git.bb
recipes-qt/qt5/qtquickcontrols_git.bb
recipes-qt/qt5/qtscript_git.bb
recipes-qt/qt5/qtsensors_git.bb
recipes-qt/qt5/qtserialport_git.bb
recipes-qt/qt5/qtsvg_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/qtwebchannel_git.bb
recipes-qt/qt5/qtwebengine_git.bb
recipes-qt/qt5/qtwebkit_git.bb
recipes-qt/qt5/qtwebsockets_git.bb
recipes-qt/qt5/qtx11extras_git.bb
recipes-qt/qt5/qtxmlpatterns_git.bb
Change-Id: I1da3a7689e16e5ffaa6e31030729a4f2f29c501d
Diffstat (limited to 'recipes-qt/qt5/qtwebengine_git.bb')
| -rw-r--r-- | recipes-qt/qt5/qtwebengine_git.bb | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/recipes-qt/qt5/qtwebengine_git.bb b/recipes-qt/qt5/qtwebengine_git.bb index a20c0b7f..9682e81a 100644 --- a/recipes-qt/qt5/qtwebengine_git.bb +++ b/recipes-qt/qt5/qtwebengine_git.bb @@ -4,9 +4,9 @@ LICENSE = "LGPL-3.0 & BSD" LIC_FILES_CHKSUM = " \ file://src/core/browser_context_qt.cpp;md5=5fe719c44250955a5d5f8fb15fc8b1da;beginline=1;endline=35 \ file://src/3rdparty/chromium/LICENSE;md5=537e0b52077bf0a616d0a0c8a79bc9d5 \ - file://LICENSE.LGPLv3;md5=3dcffeed712d3c916f9a2d9135703aff \ - file://LICENSE.GPLv3;md5=40f9bf30e783ddc201497165dfb32afb \ - file://LICENSE.GPLv2;md5=05832301944453ec79e40ba3c3cfceec \ + file://LICENSE.LGPLv3;md5=8211fde12cc8a4e2477602f5953f5b71 \ + file://LICENSE.GPLv3;md5=88e2b9117e6be406b5ed6ee4ca99a705 \ + file://LICENSE.GPLv2;md5=c96076271561b0e3785dad260634eaa8 \ " DEPENDS += " \ @@ -119,8 +119,10 @@ SRC_URI += " \ file://0002-chromium-Change-false-to-FALSE-and-1-to-TRUE-FIX-qtw.patch \ " -SRCREV_qtwebengine = "f531565348e550bc2e03917874009331556f0d66" -SRCREV_chromium = "19e3d1d3af80efee4377a4e5fcb9c214dba5be4e" +SRCREV_qtwebengine = "808ca6e6917cf17e4c30fcd3ac609164b36594cc" +# This is in git submodule, but we're using latest in 45-based +# SRCREV_chromium = "79930a541473b2e0f950d040c16ab6f22e4aeef3" +SRCREV_chromium = "9d6566ee193e8996fb867cf776dc13f697400f24" SRCREV = "${SRCREV_qtwebengine}" SRCREV_FORMAT = "qtwebengine_chromium" |