diff options
| author | Mikko Gronoff <mikko.gronoff@qt.io> | 2019-11-18 15:44:26 +0200 |
|---|---|---|
| committer | Mikko Gronoff <mikko.gronoff@qt.io> | 2019-11-18 15:45:10 +0200 |
| commit | 12cc756c7948a90367473f0a52dd2fe2b519dd24 (patch) | |
| tree | 5db143dfa7dbee5459cf4079d2e72cdf50c68d79 /conf | |
| parent | 3e502778ee161bef4177e7e7f45c0c9b78d047da (diff) | |
| parent | 432ad2aa6c3a13253fefc909faba368851d21fb1 (diff) | |
| download | meta-qt5-5.13.tar.gz | |
Merge remote-tracking branch 'qtyocto/upstream/zeus' into 5.135.13
* qtyocto/upstream/zeus:
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/ogl-runtime_git.bb
recipes-qt/qt5/qtbase/0004-configure-bump-path-length-from-256-to-512-character.patch
recipes-qt/qt5/qtbase/0013-Disable-ltcg-for-host_build.patch
recipes-qt/qt5/qtbase_git.bb
recipes-qt/qt5/qtwayland_git.bb
Change-Id: I6f325e5d4fc0f2e774962f1b5fd54e5e0e9c96d7
Diffstat (limited to 'conf')
| -rw-r--r-- | conf/layer.conf | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/conf/layer.conf b/conf/layer.conf index b466ebf7..1c9e73ca 100644 --- a/conf/layer.conf +++ b/conf/layer.conf | |||
| @@ -29,7 +29,7 @@ LAYERVERSION_qt5-layer = "1" | |||
| 29 | 29 | ||
| 30 | LAYERDEPENDS_qt5-layer = "core" | 30 | LAYERDEPENDS_qt5-layer = "core" |
| 31 | 31 | ||
| 32 | LAYERSERIES_COMPAT_qt5-layer = "sumo thud warrior" | 32 | LAYERSERIES_COMPAT_qt5-layer = "sumo thud warrior zeus" |
| 33 | 33 | ||
| 34 | LICENSE_PATH += "${LAYERDIR}/licenses" | 34 | LICENSE_PATH += "${LAYERDIR}/licenses" |
| 35 | 35 | ||