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 /conf/layer.conf | |
| parent | 5d375076a9c2b2e39f99012d3519a1cb2ff5811d (diff) | |
| parent | 7a52f924a0298857db99be20aca1484bb2b4e163 (diff) | |
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 'conf/layer.conf')
| -rw-r--r-- | conf/layer.conf | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/conf/layer.conf b/conf/layer.conf index a85c2de4..7687759c 100644 --- a/conf/layer.conf +++ b/conf/layer.conf @@ -29,6 +29,8 @@ LAYERVERSION_qt5-layer = "1" LAYERDEPENDS_qt5-layer = "core" +LAYERSERIES_COMPAT_qt5-layer = "rocko sumo" + LICENSE_PATH += "${LAYERDIR}/licenses" IMAGE_FEATURES[validitems] += "qtcreator-debug" |