diff options
| author | Samuli Piippo <samuli.piippo@theqtcompany.com> | 2016-03-01 18:25:10 +0200 |
|---|---|---|
| committer | Samuli Piippo <samuli.piippo@theqtcompany.com> | 2016-03-02 11:48:42 +0000 |
| commit | 1dc408e27ed53f0767ac35e29734c61955a04b95 (patch) | |
| tree | 099bc636484add970fe4d4e0f20f82c1d0425c74 /classes | |
| parent | 2ac3539c55143184352e7a530f213b1a507f7f4b (diff) | |
qtquickcompiler: add support for BYOS builds
Qt Quick Compiler sources codes are not released for customers, so they
cannot build it for themselves. Instead copy qtquickcompiler binary from
the SDK where we have both linux and mingw binaries available.
Change-Id: I697885365d98df394164a15e2517c7c473ac91e5
Reviewed-by: Teemu Holappa <teemu.holappa@theqtcompany.com>
Diffstat (limited to 'classes')
| -rw-r--r-- | classes/qtquickcompiler.bbclass | 25 |
1 files changed, 16 insertions, 9 deletions
diff --git a/classes/qtquickcompiler.bbclass b/classes/qtquickcompiler.bbclass index 16fb6fe8..b6710beb 100644 --- a/classes/qtquickcompiler.bbclass +++ b/classes/qtquickcompiler.bbclass @@ -20,16 +20,23 @@ ############################################################################## python __anonymous() { + provider = "qtquickcompiler" + sdk_path = d.getVar('QT_SDK_PATH', True) or "" if len(sdk_path) != 0: - bb.note("TODO: QtQuickCompiler not yet available for external builds") - else: - pn = d.getVar("PN", True) - if "toolchain-host" in pn: - d.appendVar('RDEPENDS_' + pn, " nativesdk-qtquickcompiler-tools") - if "toolchain-target" in pn: - d.appendVar('RDEPENDS_' + pn, " qtquickcompiler-dev") + qtquickcompiler_path = d.getVar('B2QTBASE', True) + "/recipes-qt/qt5-addons/qtquickcompiler-sdk" + if not os.path.isdir(qtquickcompiler_path): + bb.note("QtQuickCompiler not available") + return else: - d.appendVar('DEPENDS', " qtquickcompiler qtquickcompiler-native") - d.appendVar('EXTRA_QMAKEVARS_PRE', " CONFIG+=qtquickcompiler CONFIG+=no_qtquickcompiler_depend") + provider = "qtquickcompiler-sdk" + + pn = d.getVar("PN", True) + if "toolchain-host" in pn: + d.appendVar('RDEPENDS_' + pn, " nativesdk-%s-tools" % provider) + if "toolchain-target" in pn: + d.appendVar('RDEPENDS_' + pn, " %s-dev" % provider) + else: + d.appendVar('DEPENDS', " %s %s-native" % (provider, provider)) + d.appendVar('EXTRA_QMAKEVARS_PRE', " CONFIG+=qtquickcompiler CONFIG+=no_qtquickcompiler_depend") } |