diff options
| author | Mikko Gronoff <mikko.gronoff@qt.io> | 2018-02-15 13:15:26 +0200 |
|---|---|---|
| committer | Mikko Gronoff <mikko.gronoff@qt.io> | 2018-03-01 13:05:23 +0200 |
| commit | a96836aedf30d2e26fbcafc13b1313d1325a0730 (patch) | |
| tree | d525675103a4ddc88c25c2303b509f71bd447f32 /recipes-qt/qt5/qtwebengine_git.bb | |
| parent | e721e84659869e4a04838d95d7cdbab9d48f5c3d (diff) | |
| parent | db881bb4917628ad3eb1fa7c4f27915cf2ae60f4 (diff) | |
Merge remote-tracking branch 'qtyocto/upstream/rocko' into 5.9
* qtyocto/upstream/rocko:
qwt-qt5: rewrite completely
qt5: upgrade to 5.9.4
qt: refresh remaining patches and tags in meta-qt5 repos
qtwebengine: explicitly depend on bison-native
qtlocation: correct PACKAGECONFIG for mapboxgl
gstreamer1.0-plugins-bad: add expansion parameter
Bump to Qt 5.9.3
Conflicts:
recipes-qt/qt5/qtbase/0001-Add-linux-oe-g-platform.patch
recipes-qt/qt5/qtquickcontrols/0001-texteditor-fix-invalid-use-of-incomplete-type-class-.patch
recipes-qt/qt5/qtquickcontrols_git.bb
recipes-qt/qt5/qtwayland/0001-fix-build-without-xkbcommon-evdev.patch
recipes-qt/qt5/qtwayland_git.bb
Change-Id: I1a9a35640f301f60d8363d4c3a6bb226ea40c2d1
Diffstat (limited to 'recipes-qt/qt5/qtwebengine_git.bb')
| -rw-r--r-- | recipes-qt/qt5/qtwebengine_git.bb | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/recipes-qt/qt5/qtwebengine_git.bb b/recipes-qt/qt5/qtwebengine_git.bb index b7c65c60..bfc942ff 100644 --- a/recipes-qt/qt5/qtwebengine_git.bb +++ b/recipes-qt/qt5/qtwebengine_git.bb @@ -15,6 +15,7 @@ LIC_FILES_CHKSUM = " \ DEPENDS += " \ ninja-native \ yasm-native \ + bison-native \ qtwebchannel \ qtbase qtdeclarative qtxmlpatterns qtquickcontrols qtquickcontrols2 \ qtlocation \ @@ -41,7 +42,7 @@ EXTRA_QMAKEVARS_CONFIGURE += "-feature-system-ninja -no-feature-system-gn" # http://errors.yoctoproject.org/Errors/Details/150333/ SECURITY_STRINGFORMAT = "" -# To use system ffmpeg you need to enable also libwebp, opus, vpx +# To use system ffmpeg you need to enable also libwebp, opus, vpx # Only depenedencies available in oe-core are enabled by default PACKAGECONFIG ??= "libwebp flac libevent libxslt speex nss" PACKAGECONFIG[opus] = "WEBENGINE_CONFIG+=use_system_opus,,libopus" @@ -129,7 +130,7 @@ RDEPENDS_${PN}-examples += " \ QT_MODULE_BRANCH_CHROMIUM = "56-based" # Patches from https://github.com/meta-qt5/qtwebengine/commits/b5.9 -# 5.9.meta-qt5.3 +# 5.9.meta-qt5.4 SRC_URI += " \ ${QT_GIT}/qtwebengine-chromium.git;name=chromium;branch=${QT_MODULE_BRANCH_CHROMIUM};protocol=${QT_GIT_PROTOCOL};destsuffix=git/src/3rdparty \ file://0001-functions.prf-allow-build-for-linux-oe-g-platform.patch \ @@ -138,8 +139,8 @@ SRC_URI += " \ file://0004-Force-host-toolchain-configuration.patch \ " -# Patches from https://github.com/meta-qt5/qtwebengine-chromium/commits/56-based -# 56-based.meta-qt5.2 +# Patches from https://github.com/meta-qt5/qtwebengine-chromium/commits/56-based +# 56-based.meta-qt5.4 SRC_URI += " \ file://0001-chromium-Change-false-to-FALSE-and-1-to-TRUE-FIX-qtw.patch;patchdir=src/3rdparty \ file://0002-chromium-Force-host-toolchain-configuration.patch;patchdir=src/3rdparty \ |