diff options
| author | Samuli Piippo <samuli.piippo@qt.io> | 2018-09-11 16:32:00 +0300 |
|---|---|---|
| committer | Samuli Piippo <samuli.piippo@qt.io> | 2018-09-11 17:07:33 +0300 |
| commit | 1b356a70d61547992d51025e6a1b6edb48886bb6 (patch) | |
| tree | f11b34a8e39e37fb3017ddb5c3119dfd6f011022 /recipes-qt/qt5/qtscript_git.bb | |
| parent | 78b8872328a2162c1030831a36d0814da6c200a5 (diff) | |
| parent | 9ffdd55c7c03d9e608409a95ed4c51ae0fb3d511 (diff) | |
| download | meta-qt5-1b356a70d61547992d51025e6a1b6edb48886bb6.tar.gz | |
Merge remote-tracking branch 'qtyocto/upstream/master' into 5.11
* qtyocto/upstream/master:
qtscript: Update the custom patch from mainline
qtbase: remove renameat2 PACKAGECONFIG
qtbase: fix build with glibc-2.28 - for non-readers like me
qtwebengine: Fix optonal glib-2.0 dependency
qtwebkit_git.bb: Fix configure failure on bison
qtwebengine: Add PACKAGECONFIG for pepper-plugins printing-and-pdf spellchecker
qtwebengine: add a package config to enable proprietary codecs
qt3d-runtime: add recipe for Qt 3D Studio runtime library
qtbase: update the dependency for gbm PACKAGECONFIG
qtbase: fix build with glibc-2.28
nativesdk-packagegroup-qt5-toolchain-host: Add perl modules
qtchooser: drop useless patch, set PV
packagegroup-qt5-toolchain-target: Remove non-existing qttranslations-qt from rdeps
qtbase: Add a kde PACKAGECONFIG
Change-Id: I8b407611ee7473bbd00ece06f6613d93ca56ca0d
Diffstat (limited to 'recipes-qt/qt5/qtscript_git.bb')
| -rw-r--r-- | recipes-qt/qt5/qtscript_git.bb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/recipes-qt/qt5/qtscript_git.bb b/recipes-qt/qt5/qtscript_git.bb index 23858d33..6850cf8a 100644 --- a/recipes-qt/qt5/qtscript_git.bb +++ b/recipes-qt/qt5/qtscript_git.bb | |||
| @@ -11,7 +11,7 @@ LIC_FILES_CHKSUM = " \ | |||
| 11 | file://LICENSE.LGPL3;md5=e6a600fd5e1d9cbde2d983680233ad02 \ | 11 | file://LICENSE.LGPL3;md5=e6a600fd5e1d9cbde2d983680233ad02 \ |
| 12 | " | 12 | " |
| 13 | 13 | ||
| 14 | SRC_URI += "file://0001-javascriptcore-Use-64-bit-ints.patch" | 14 | SRC_URI += "file://0001-3rdparty-javascriptcore-Add-RISC-V-support.patch" |
| 15 | 15 | ||
| 16 | # qemuarm build fails with: | 16 | # qemuarm build fails with: |
| 17 | # /OE/build/oe-core/tmp-glibc/work/armv5te-oe-linux-gnueabi/qtscript/5.4.1+gitAUTOINC+822df36f25-r0/git/src/3rdparty/javascriptcore/JavaScriptCore/assembler/AssemblerBuffer.h: In member function 'void QTJSC::AssemblerBuffer::putInt64Unchecked(int64_t)': | 17 | # /OE/build/oe-core/tmp-glibc/work/armv5te-oe-linux-gnueabi/qtscript/5.4.1+gitAUTOINC+822df36f25-r0/git/src/3rdparty/javascriptcore/JavaScriptCore/assembler/AssemblerBuffer.h: In member function 'void QTJSC::AssemblerBuffer::putInt64Unchecked(int64_t)': |