diff options
| author | Samuli Piippo <samuli.piippo@qt.io> | 2020-01-13 15:42:26 +0200 |
|---|---|---|
| committer | Samuli Piippo <samuli.piippo@qt.io> | 2020-01-13 15:57:32 +0200 |
| commit | f6ebff397a53e9c2a23f67d1fc74b5fed11df4f9 (patch) | |
| tree | d0094937e85e890e9379d1f1de769af62fb6e656 /recipes-qt/qt5/qtwebkit_git.bb | |
| parent | 9ff0a36249205d36bb44cc34a26cb6201180a89f (diff) | |
| parent | 1b8e557011fffd0446e5f660d1b317c664a7cf08 (diff) | |
| download | meta-qt5-f6ebff397a53e9c2a23f67d1fc74b5fed11df4f9.tar.gz | |
Merge remote-tracking branch 'qt/upstream/master' into 5.14
* qt/upstream/master: (28 commits)
qtbase: Use pcre packages by default
qt5: use PACKAGECONFIG to disable tests and examples
qtlocation: use geoclue 2
qtbase: use offscreen platform plugin for tools
qtbase: add openssl PACKAGECONFIG for native nativesdk
qtbase-native: disable vulkan support
maliit-framework-qt5: fix test installations
qtenginio: remove obsolete module
ogl-runtime: update to v2.5.0 release
qtquick3d: add recipe
qtwebengine: refresh the patches and upload them to meta-qt5 forks on github for maintenance
qtbase: refresh the patches and upload them to meta-qt5 forks on github for maintenance
qt5: Update to Qt 5.14.0
qtbase: Fix patch fuzz detected with devtool
qtbase: Backport the patch from upstream gerrit
qt5-creator: Update musl patch to link qmldesigner with -lexecinfo
qtwebengine: Move CharAllocator definition to header
qt5-creator: Add missing dep on libz.so
qt5-creator: Make clang-format patch work with multiple clang versions
qtwebengine: Include cstddef for size_t definition
...
Change-Id: Ia71a5f1c53e8ce18a1a8b219f8c8ffee96723fb7
Diffstat (limited to 'recipes-qt/qt5/qtwebkit_git.bb')
| -rw-r--r-- | recipes-qt/qt5/qtwebkit_git.bb | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/recipes-qt/qt5/qtwebkit_git.bb b/recipes-qt/qt5/qtwebkit_git.bb index abf63097..6cc789f0 100644 --- a/recipes-qt/qt5/qtwebkit_git.bb +++ b/recipes-qt/qt5/qtwebkit_git.bb | |||
| @@ -49,9 +49,13 @@ EXTRA_OECMAKE += " \ | |||
| 49 | 49 | ||
| 50 | EXTRA_OECMAKE_append_toolchain-clang = " -DCMAKE_CXX_IMPLICIT_INCLUDE_DIRECTORIES:PATH='${STAGING_INCDIR}'" | 50 | EXTRA_OECMAKE_append_toolchain-clang = " -DCMAKE_CXX_IMPLICIT_INCLUDE_DIRECTORIES:PATH='${STAGING_INCDIR}'" |
| 51 | 51 | ||
| 52 | # JIT not supported on MIPS64 | 52 | # JIT not supported on MIPS/PPC |
| 53 | EXTRA_OECMAKE_append_mips64 = " -DENABLE_JIT=OFF " | 53 | EXTRA_OECMAKE_append_mipsarch = " -DENABLE_JIT=OFF -DENABLE_C_LOOP=ON " |
| 54 | EXTRA_OECMAKE_append_mips64el = " -DENABLE_JIT=OFF " | 54 | EXTRA_OECMAKE_append_powerpc = " -DENABLE_JIT=OFF -DENABLE_C_LOOP=ON " |
| 55 | # Disable gold on mips64/clang | ||
| 56 | # mips64-yoe-linux-musl-ld.gold: internal error in get_got_page_offset, at ../../gold/mips.cc:6260 | ||
| 57 | # mips-yoe-linux-musl-ld.gold: error: Can't find matching LO16 reloc | ||
| 58 | EXTRA_OECMAKE_append_toolchain-clang_mipsarch = " -DUSE_LD_GOLD=OFF " | ||
| 55 | 59 | ||
| 56 | PACKAGECONFIG ??= "qtlocation qtmultimedia qtsensors qtwebchannel \ | 60 | PACKAGECONFIG ??= "qtlocation qtmultimedia qtsensors qtwebchannel \ |
| 57 | ${@bb.utils.filter('DISTRO_FEATURES', 'x11', d)} \ | 61 | ${@bb.utils.filter('DISTRO_FEATURES', 'x11', d)} \ |