diff options
| author | Mikko Gronoff <mikko.gronoff@qt.io> | 2019-11-22 10:26:45 +0200 |
|---|---|---|
| committer | Mikko Gronoff <mikko.gronoff@qt.io> | 2019-11-25 09:19:26 +0200 |
| commit | 929b2ef266c6eb4cc1f5500f421fda449cd8900b (patch) | |
| tree | 2df07f423983f7ef00c1c4c817b37416b25553ae /recipes-qt/qt5/qtscxml_git.bb | |
| parent | fd86202d56c542011d24dc518457631bc00901c9 (diff) | |
| parent | 12cc756c7948a90367473f0a52dd2fe2b519dd24 (diff) | |
Merge remote-tracking branch 'qtyocto/5.13' into 5.14
* origin/5.13:
12cc756 Merge remote-tracking branch 'qtyocto/upstream/zeus' into 5.13
432ad2a qttools: don't install tst_qtattributionsscanner
8115617 qt5: Upgrade to Qt 5.13.2
267e646 python(3)-pyqt5: add qml support
653e12f libqofono: bump SRCREV and add a fix for voicecall
cefb48e qtbase: Add PACKAGECONFIG for lttng
911b346 layer: Mark zeus as compatible release
c373272 ogl-runtime: Fix build on x86_64
9172ba1 README.md: Document need for 32bit host compiler
db2fd6c qtwayland: Fix build with clang/libc++
6b5122e qtbase: Fix build when fp16 is used
Conflicts:
recipes-qt/qt5/qtbase/0004-configure-bump-path-length-from-256-to-512-character.patch
recipes-qt/qt5/qtbase/0011-tst_qlocale-Enable-QT_USE_FENV-only-on-glibc.patch
recipes-qt/qt5/qtbase/0012-mkspecs-common-gcc-base.conf-Use-I-instead-of-isyste.patch
recipes-qt/qt5/qtbase/0013-Disable-ltcg-for-host_build.patch
recipes-qt/qt5/qtbase/0019-Avoid-renameeat2-for-native-sdk-builds.patch
recipes-qt/qt5/qtscxml_git.bb
recipes-qt/qt5/qtwebengine/0001-Force-host-toolchain-configuration.patch
recipes-qt/qt5/qtwebengine/chromium/0002-chromium-stack-pointer-clobber.patch
recipes-qt/qt5/qtwebengine/chromium/0003-chromium-fix-build-with-clang.patch
recipes-qt/qt5/qtwebengine/chromium/0004-chromium-Exclude-CRC32-for-32bit-arm.patch
recipes-qt/qt5/qtwebengine/chromium/0005-chromium-Do-not-try-to-set-the-guessed-values-for-ma.patch
recipes-qt/qt5/qtwebengine/chromium/0006-chromium-aarch64-skia-build-fix.patch
recipes-qt/qt5/qtwebengine/chromium/0017-chromium-musl-Adjust-default-pthread-stack-size.patch
Change-Id: I475f15bad150bbc86ed49c1c0807fe0948e60723
Diffstat (limited to 'recipes-qt/qt5/qtscxml_git.bb')
| -rw-r--r-- | recipes-qt/qt5/qtscxml_git.bb | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/recipes-qt/qt5/qtscxml_git.bb b/recipes-qt/qt5/qtscxml_git.bb index c17e42ec..2fe978d7 100644 --- a/recipes-qt/qt5/qtscxml_git.bb +++ b/recipes-qt/qt5/qtscxml_git.bb @@ -12,11 +12,9 @@ DEPENDS += "qtbase qtdeclarative qtxmlpatterns qtscxml-native" SRCREV = "d42bb288e550c734cc2036c987590592cea634a1" -# Patches from https://github.com/meta-qt5/qtscxml/commits/b5.12 -# 5.12.meta-qt5.2 -SRC_URI += "\ - file://0001-Use-external-host-bin-path-for-cmake-file.patch \ -" +# Patches from https://github.com/meta-qt5/qtscxml/commits/b5.13 +# 5.13.meta-qt5.1 +SRC_URI += "file://0001-Use-external-host-bin-path-for-cmake-file.patch" do_install_append_class-nativesdk() { # qml files not needed in nativesdk |