diff options
| author | Mikko Gronoff <mikko.gronoff@qt.io> | 2018-01-10 10:10:17 +0200 |
|---|---|---|
| committer | Mikko Gronoff <mikko.gronoff@qt.io> | 2018-01-10 10:10:17 +0200 |
| commit | bc0625e7a03f9f04fdae3a89137812a216e977cd (patch) | |
| tree | 4adb4e8357aea4922fd27e9758ea649deba73362 /recipes-qt/qt5/qtwebengine_git.bb | |
| parent | a22c728d16e449f3f573f4fd1324486753378592 (diff) | |
| parent | 3cf0bbb8e1113376d5b5b26ecff362e180a180fd (diff) | |
Merge remote-tracking branch 'qtyocto/upstream/master' into 5.10
* qtyocto/upstream/master:
qtbase_git: install qt.conf for the target
qtbase: mkspecs: add default toolchain options
qt5: remove use of OE_QMAKE_WAYLAND_SCANNER
gstreamer1.0-plugins-bad: add expansion parameter
qtlocation: correct PACKAGECONFIG for mapboxgl
qt5: use correct HostPrefix
qwt-qt5: rewrite completely
Fix missing OE_QMAKE_STRIP env variable
Upgrade to Qt 5.10.0
qtwebengine: make test suite succeed
Conflicts:
recipes-qt/qt5/nativesdk-qtbase_git.bb
recipes-qt/qt5/qt3d_git.bb
recipes-qt/qt5/qt5-git.inc
recipes-qt/qt5/qtbase-native_git.bb
ecipes-qt/qt5/qtbase_git.bb
recipes-qt/qt5/qtcanvas3d_git.bb
recipes-qt/qt5/qtcharts_git.bb
recipes-qt/qt5/qtconnectivity_git.bb
recipes-qt/qt5/qtdatavis3d_git.bb
recipes-qt/qt5/qtdeclarative_git.bb
recipes-qt/qt5/qtgamepad_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/qtnetworkauth_git.bb
recipes-qt/qt5/qtquickcontrols2_git.bb
recipes-qt/qt5/qtquickcontrols_git.bb
recipes-qt/qt5/qtremoteobjects_git.bb
recipes-qt/qt5/qtscript_git.bb
recipes-qt/qt5/qtscxml_git.bb
recipes-qt/qt5/qtsensors_git.bb
recipes-qt/qt5/qtserialbus_git.bb
recipes-qt/qt5/qtserialport_git.bb
recipes-qt/qt5/qtsvg_git.bb
recipes-qt/qt5/qttools_git.bb
recipes-qt/qt5/qttranslations_git.bb
recipes-qt/qt5/qtvirtualkeyboard_git.bb
recipes-qt/qt5/qtwayland_git.bb
recipes-qt/qt5/qtwebchannel_git.bb
recipes-qt/qt5/qtwebengine_git.bb
recipes-qt/qt5/qtwebsockets_git.bb
recipes-qt/qt5/qtwebview_git.bb
recipes-qt/qt5/qtx11extras_git.bb
recipes-qt/qt5/qtxmlpatterns_git.bb
Task-number: QTBUG-65164
Change-Id: I3a54ce7f3f82dcce2d9d1a13585a41178bda358c
Diffstat (limited to 'recipes-qt/qt5/qtwebengine_git.bb')
| -rw-r--r-- | recipes-qt/qt5/qtwebengine_git.bb | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/recipes-qt/qt5/qtwebengine_git.bb b/recipes-qt/qt5/qtwebengine_git.bb index 100458aa..214b9ac3 100644 --- a/recipes-qt/qt5/qtwebengine_git.bb +++ b/recipes-qt/qt5/qtwebengine_git.bb @@ -139,6 +139,8 @@ SRC_URI += " \ " SRC_URI_append_libc-musl = "\ + file://0005-musl-don-t-use-pvalloc-as-it-s-not-available-on-musl.patch \ + file://0006-musl-link-against-libexecinfo.patch \ file://0004-chromium-musl-sandbox-Define-TEMP_FAILURE_RETRY-if-n.patch;patchdir=src/3rdparty \ file://0005-chromium-musl-Avoid-mallinfo-APIs-on-non-glibc-linux.patch;patchdir=src/3rdparty \ file://0006-chromium-musl-include-fcntl.h-for-loff_t.patch;patchdir=src/3rdparty \ |