diff options
| author | Mikko Gronoff <mikko.gronoff@qt.io> | 2018-04-24 10:26:07 +0300 |
|---|---|---|
| committer | Mikko Gronoff <mikko.gronoff@qt.io> | 2018-05-09 05:52:19 +0300 |
| commit | db03213142de38997c95f53a5e731a92e9c48d2f (patch) | |
| tree | 43176f11ca4a040b3292bcadeda888367f559a0e /recipes-qt/qt5/qtscxml/0001-Use-external-host-bin-path-for-cmake-file.patch | |
| parent | 5d375076a9c2b2e39f99012d3519a1cb2ff5811d (diff) | |
| parent | 7a52f924a0298857db99be20aca1484bb2b4e163 (diff) | |
| download | meta-qt5-db03213142de38997c95f53a5e731a92e9c48d2f.tar.gz | |
Merge remote-tracking branch 'qtyocto/upstream/rocko' into 5.9
* qtyocto/upstream/rocko:
7a52f92 packagegroup-qt5-toolchain-target/qttranslations: fix nothing provides qttranslations-qtconfig
f48752c qt5: upgrade to 5.9.5
4e7ba65 Change default SRC_URI from github.com to code.qt.io
bf68f8b layer.conf: add LAYERSERIES_COMPAT
5b71698 maliit-framework-qt5: refresh patches
32bb7d1 qt5-git.inc: drop nobranch=1
Conflicts:
recipes-qt/qt5/qtquickcontrols/0001-texteditor-fix-invalid-use-of-incomplete-type-class-.patch
recipes-qt/qt5/qtwayland/0001-fix-build-without-xkbcommon-evdev.patch
Change-Id: Ibea502ea07d8b7e145c1fa55cf82d8b70435d983
Diffstat (limited to 'recipes-qt/qt5/qtscxml/0001-Use-external-host-bin-path-for-cmake-file.patch')
| -rw-r--r-- | recipes-qt/qt5/qtscxml/0001-Use-external-host-bin-path-for-cmake-file.patch | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/recipes-qt/qt5/qtscxml/0001-Use-external-host-bin-path-for-cmake-file.patch b/recipes-qt/qt5/qtscxml/0001-Use-external-host-bin-path-for-cmake-file.patch index 86662558..36a6d031 100644 --- a/recipes-qt/qt5/qtscxml/0001-Use-external-host-bin-path-for-cmake-file.patch +++ b/recipes-qt/qt5/qtscxml/0001-Use-external-host-bin-path-for-cmake-file.patch | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | From abb8a52ae86ab62c88b4423823ae6104255cddff Mon Sep 17 00:00:00 2001 | 1 | From c9886590333dce8a1dd1e198f5449bb841033bc8 Mon Sep 17 00:00:00 2001 |
| 2 | From: Samuli Piippo <samuli.piippo@qt.io> | 2 | From: Samuli Piippo <samuli.piippo@qt.io> |
| 3 | Date: Tue, 10 Jan 2017 15:28:26 +0200 | 3 | Date: Tue, 10 Jan 2017 15:28:26 +0200 |
| 4 | Subject: [PATCH] Use external host bin path for cmake file | 4 | Subject: [PATCH] Use external host bin path for cmake file |