diff options
| author | Mikko Gronoff <mikko.gronoff@qt.io> | 2018-09-26 12:26:29 +0300 |
|---|---|---|
| committer | Mikko Gronoff <mikko.gronoff@qt.io> | 2018-09-26 13:30:15 +0300 |
| commit | a34f936566039c2cba6a0e58192398255a0653b8 (patch) | |
| tree | 609467ab742ba1b01d4eb9a3999587454086f24b /recipes-qt/qt5/qtscript_git.bb | |
| parent | fa6bdc2e91ddb6755d7ce463b623b4eed706d438 (diff) | |
| parent | 3439f344fbb4c1ee2b13ddb54435716c53d79be2 (diff) | |
Merge remote-tracking branch 'qtyocto/5.11' into 5.12
* qtyocto/5.11:
3439f34 qtbase: update changelog
0bc53eb qt5: update submodules
1b356a7 Merge remote-tracking branch 'qtyocto/upstream/master' into 5.11
9ffdd55 qtscript: Update the custom patch from mainline
95d64ea qtbase: remove renameat2 PACKAGECONFIG
2d1d807 qtbase: fix build with glibc-2.28 - for non-readers like me
e4abbde qtwebengine: Fix optonal glib-2.0 dependency
1fb8aff qtwebkit_git.bb: Fix configure failure on bison
cb7dfcc qtwebengine: Add PACKAGECONFIG for pepper-plugins printing-and-pdf spellchecker
70b090a qtwebengine: add a package config to enable proprietary codecs
bb38f64 qt3d-runtime: add recipe for Qt 3D Studio runtime library
75e2d3a qtbase: update the dependency for gbm PACKAGECONFIG
539e4f0 qtbase: fix build with glibc-2.28
c2e4ec6 nativesdk-packagegroup-qt5-toolchain-host: Add perl modules
4587cc3 qtchooser: drop useless patch, set PV
3a4ad54 packagegroup-qt5-toolchain-target: Remove non-existing qttranslations-qt from rdeps
2736dcf qtbase: Add a kde PACKAGECONFIG
Conflicts:
recipes-qt/qt5/nativesdk-qtbase_git.bb
recipes-qt/qt5/qtbase-native_git.bb
recipes-qt/qt5/qtbase_git.bb
recipes-qt/qt5/qtdeclarative_git.bb
Change-Id: Ic58c0577f9df0aaac613befeacb1db98c6af5d17
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 03711a65..63f62a43 100644 --- a/recipes-qt/qt5/qtscript_git.bb +++ b/recipes-qt/qt5/qtscript_git.bb @@ -11,7 +11,7 @@ LIC_FILES_CHKSUM = " \ file://LICENSE.LGPL3;md5=e6a600fd5e1d9cbde2d983680233ad02 \ " -SRC_URI += "file://0001-javascriptcore-Use-64-bit-ints.patch" +SRC_URI += "file://0001-3rdparty-javascriptcore-Add-RISC-V-support.patch" # qemuarm build fails with: # /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)': |