diff options
| author | Samuli Piippo <samuli.piippo@theqtcompany.com> | 2015-10-30 15:54:13 +0200 |
|---|---|---|
| committer | Samuli Piippo <samuli.piippo@theqtcompany.com> | 2015-11-02 10:02:04 +0000 |
| commit | 0620623f153cdbccf46840c79eade69a1848b296 (patch) | |
| tree | 2475cd90feb684cbe2da1f2c5b57584113abc2b5 | |
| parent | 41133640433de1d25a052b2e685e2c81983cd29d (diff) | |
qtquickcompiler: add dev packages to toolchain
Change-Id: If6fa08858c0ab19e92c45623f7dcdcf3d8985c1a
Reviewed-by: Teemu Holappa <teemu.holappa@theqtcompany.com>
| -rw-r--r-- | classes/qtquickcompiler.bbclass | 4 | ||||
| -rw-r--r-- | recipes-qt/packagegroups/packagegroup-b2qt-embedded-qt5-toolchain-target.bb | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/classes/qtquickcompiler.bbclass b/classes/qtquickcompiler.bbclass index 14787417..acb1bd6d 100644 --- a/classes/qtquickcompiler.bbclass +++ b/classes/qtquickcompiler.bbclass @@ -26,8 +26,10 @@ python __anonymous() { bb.note("TODO: QtQuickCompiler not yet available for external builds") else: pn = d.getVar("PN", True) - if pn.startswith("nativesdk-"): + if "toolchain-host" in pn: d.appendVar('RDEPENDS_' + pn, " nativesdk-qtquickcompiler-tools") + if "toolchain-target" in pn: + d.appendVar('RDEPENDS_' + pn, " qtquickcompiler-dev") else: d.appendVar('DEPENDS', " qtquickcompiler qtquickcompiler-native") d.appendVar('EXTRA_QMAKEVARS_PRE', " CONFIG+=qtquickcompiler CONFIG+=no_qtquickcompiler_depend") diff --git a/recipes-qt/packagegroups/packagegroup-b2qt-embedded-qt5-toolchain-target.bb b/recipes-qt/packagegroups/packagegroup-b2qt-embedded-qt5-toolchain-target.bb index a64f4576..ccc78a48 100644 --- a/recipes-qt/packagegroups/packagegroup-b2qt-embedded-qt5-toolchain-target.bb +++ b/recipes-qt/packagegroups/packagegroup-b2qt-embedded-qt5-toolchain-target.bb @@ -24,7 +24,7 @@ DESCRIPTION = "Target packages for B2Qt embedded Qt5 SDK" LICENSE = "QtEnterprise" PR = "r0" -inherit packagegroup +inherit packagegroup qtquickcompiler PACKAGEGROUP_DISABLE_COMPLEMENTARY = "1" |