diff options
| author | Samuli Piippo <samuli.piippo@theqtcompany.com> | 2016-02-29 09:15:43 +0200 |
|---|---|---|
| committer | Samuli Piippo <samuli.piippo@theqtcompany.com> | 2016-02-29 11:26:05 +0200 |
| commit | 60c8b35f13f0969a2244e5ab06333fc3994ed221 (patch) | |
| tree | 9df5eef7ff4700a8d74a2a667d477ec458a63a48 /recipes-qt/qt5/qtwebengine_git.bb | |
| parent | ddbe177dae46353f08f7326a11d3b3fd5a1f8435 (diff) | |
| parent | 26637f766a40fd59df6e1edc65e4b14cd2f78014 (diff) | |
Merge remote-tracking branch 'meta-qt5/master' into master-mingw
* meta-qt5/master:
qtbase: add runtime dependency to xkeyboard-config
recipetool: add support for Qt5 to meta-qt5
libconnman-qt5: Blacklist because of connman-qt5.pc
qt5: skip libdir for ${PN}-dbg and dev-elf for ${PN}-examples-dev
qtbase: upgrade SRCREVs a bit more
nativesdk-qtbase: use runtime linked dbus
Conflicts:
recipes-qt/qt5/nativesdk-qtbase_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/0004-qt_module-Fix-pkgconfig-and-libtool-replacements.patch
recipes-qt/qt5/qtbase/0010-Add-external-hostbindir-option-for-native-sdk.patch
recipes-qt/qt5/qtbase_git.bb
Change-Id: I51f42699487c82a5f0e9c52f5fd5c5bf4bd51eff
Diffstat (limited to 'recipes-qt/qt5/qtwebengine_git.bb')
| -rw-r--r-- | recipes-qt/qt5/qtwebengine_git.bb | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/recipes-qt/qt5/qtwebengine_git.bb b/recipes-qt/qt5/qtwebengine_git.bb index 0557ec7f..30168f43 100644 --- a/recipes-qt/qt5/qtwebengine_git.bb +++ b/recipes-qt/qt5/qtwebengine_git.bb @@ -111,14 +111,15 @@ SRC_URI += " \ ${QT_GIT}/qtwebengine-chromium.git;name=chromium;branch=${QT_MODULE_BRANCH_CHROMIUM};destsuffix=git/src/3rdparty \ file://0001-functions.prf-Don-t-match-QMAKE_EXT_CPP-or-QMAKE_EXT.patch \ file://0002-functions.prf-Make-sure-we-only-use-the-file-name-to.patch \ + file://0003-functions.prf-allow-build-for-linux-oe-g-platform.patch \ file://0004-WebEngine-qquickwebengineview_p_p.h-add-include-QCol.patch \ file://0005-Include-dependency-to-QCoreApplication-translate.patch \ file://0001-chromium-base.gypi-include-atomicops_internals_x86_g.patch \ file://0002-chromium-Change-false-to-FALSE-and-1-to-TRUE-FIX-qtw.patch \ " -SRCREV_qtwebengine = "87cc80fd8182b24ff42f0f5458cb82f139730536" -SRCREV_chromium = "3f655a31b4979b0862e5aec1c8f47b597464749f" +SRCREV_qtwebengine = "3f02c25de46f5ff296b8189af3435ce5800b39a7" +SRCREV_chromium = "779a2388fc123a7f3a178ce2ced921ee4a307e2c" SRCREV = "${SRCREV_qtwebengine}" SRCREV_FORMAT = "qtwebengine_chromium" |