diff options
| author | Samuli Piippo <samuli.piippo@qt.io> | 2016-10-20 14:22:57 +0300 |
|---|---|---|
| committer | Samuli Piippo <samuli.piippo@qt.io> | 2016-10-27 12:46:53 +0000 |
| commit | f3f7d8ef1ee02d3a2e691657a0ac26cb0261eda6 (patch) | |
| tree | cf92f4b22809a47415e30a9d405d232cd7214ddc /recipes-qt/qt5/qtwebengine_git.bb | |
| parent | 429a8e9a0b720b2ca1e66fff921888bbdef3e378 (diff) | |
| download | meta-qt5-f3f7d8ef1ee02d3a2e691657a0ac26cb0261eda6.tar.gz | |
qt5: update submodules
Add more PACKAGECONFIGs for qtbase. Merge the two qtwayland recipes to
one that supports all three targets (target, native, nativesdk).
Previous workaround removed and new ones added for: QTBUG-56656, QTBUG-56666
Reduce number of patches applied to qtbase.
Change-Id: I6b82fd46aaade4f14cf61e29adb7fc984070333b
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
Reviewed-by: Jonathan Liu <net147@gmail.com>
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
Diffstat (limited to 'recipes-qt/qt5/qtwebengine_git.bb')
| -rw-r--r-- | recipes-qt/qt5/qtwebengine_git.bb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/recipes-qt/qt5/qtwebengine_git.bb b/recipes-qt/qt5/qtwebengine_git.bb index 911d0b35..5bf6056c 100644 --- a/recipes-qt/qt5/qtwebengine_git.bb +++ b/recipes-qt/qt5/qtwebengine_git.bb | |||
| @@ -122,8 +122,8 @@ 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 = "6106d6b0b3833e63aeb568f37a47fc6adca8fdb9" | 125 | SRCREV_qtwebengine = "4894406d111d7c7c0fb06b56e52706a20b35d0b3" |
| 126 | SRCREV_chromium = "8158f645b0cfea734b5ff99777227380f615873f" | 126 | SRCREV_chromium = "f3ce802c71aeaeb7dd218180a3bc5c6ac63b445d" |
| 127 | SRCREV = "${SRCREV_qtwebengine}" | 127 | SRCREV = "${SRCREV_qtwebengine}" |
| 128 | 128 | ||
| 129 | SRCREV_FORMAT = "qtwebengine_chromium" | 129 | SRCREV_FORMAT = "qtwebengine_chromium" |