diff options
| author | Samuli Piippo <samuli.piippo@qt.io> | 2019-11-26 16:07:49 +0200 |
|---|---|---|
| committer | Samuli Piippo <samuli.piippo@qt.io> | 2019-11-27 07:38:23 +0200 |
| commit | 3bd81f1997683774dd28e6b8673c9b19b66a73ec (patch) | |
| tree | 368a37454e3d7031b33a609ef9a428fa43c73880 /recipes-qt/qt5/qtscxml_git.bb | |
| parent | 08cc9ad2579f897b84d4fb430d898103dc568d26 (diff) | |
| parent | 929b2ef266c6eb4cc1f5500f421fda449cd8900b (diff) | |
Merge remote-tracking branch 'qt/5.14' into 5.15
* qt/5.14: (22 commits)
qtwebengine: add clang fix
qt5: update submodules
qt5: use PACKAGECONFIG to disable tests and examples
qt5: update submodules
qt5: update submodules
qt5: update submodules
qt5: update submodules
ogl-runtime: update to v2.5.0 release
qttools: don't install tst_qtattributionsscanner
qt5: Upgrade to Qt 5.13.2
python(3)-pyqt5: add qml support
libqofono: bump SRCREV and add a fix for voicecall
qt5: update submodules
qt5: update submodules
qtbase: add openssl PACKAGECONFIG for native nativesdk
ogl-runtime: update to 2.5
qtbase: Add PACKAGECONFIG for lttng
layer: Mark zeus as compatible release
ogl-runtime: Fix build on x86_64
README.md: Document need for 32bit host compiler
...
Change-Id: I3892eef7a2ee02cde0f493df7aa1a27f683f1799
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 5aa24f40..eab34409 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 = "a84f5f9d10b59606fabbe3448c8e619e6694565a" -# 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 |