diff options
| author | Samuli Piippo <samuli.piippo@qt.io> | 2016-08-25 16:16:13 +0300 |
|---|---|---|
| committer | Samuli Piippo <samuli.piippo@qt.io> | 2016-08-25 16:16:59 +0300 |
| commit | 0765ab46150bfa6a930487e25ecb0eed365d90f1 (patch) | |
| tree | 6ad4a5b5b24828ffdf6897f3f90197cd281624c5 /classes | |
| parent | 38f883909812a8ca6815431295c8a0fa4e92489d (diff) | |
| parent | 960945859db570e237c022b2c3269cec3902c876 (diff) | |
Merge remote-tracking branch 'origin/jethro' into dev
* origin/jethro:
Update meta layers
Reuse qt5-git.inc in automotive recipes
ota: update recipe
Correctly update qtquickcompiler SHA1
Reuse qt5-git.inc to define git repo location
Remove automotive recipes
Update Qt5 submodules
Handle qtquickcompiler in update-qt5-modules.sh script
qtwebbrowser: update source uri
Correctly use QtQuickCompiler when available
gammaray: update revision to match gammaray plugin in QtC 4.1
Fix adb to toradex-imx6 image
Change git protocol from ssh to http
Update qtdeclarative module
Update boot2qt-demos version
Change-Id: I1665b538bcd12a0dffb6403a6d387eebb100c762
Diffstat (limited to 'classes')
| -rw-r--r-- | classes/internal-build.bbclass | 1 | ||||
| -rw-r--r-- | classes/qtquickcompiler.bbclass | 20 |
2 files changed, 11 insertions, 10 deletions
diff --git a/classes/internal-build.bbclass b/classes/internal-build.bbclass index 3b7f4227..ecee8632 100644 --- a/classes/internal-build.bbclass +++ b/classes/internal-build.bbclass @@ -34,6 +34,7 @@ python enable_internal_build () { except: return + e.data.setVar('ENABLE_QTQUICKCOMPILER', "1") e.data.setVar('SSTATE_MIRRORS', "file://.* http://yocto-cache.ci.local/sstate-caches/${DISTRO_CODENAME}/PATH") e.data.setVar('PREMIRRORS', "\ ftp://.*/.* http://yocto-cache.ci.local/sources/ \n \ diff --git a/classes/qtquickcompiler.bbclass b/classes/qtquickcompiler.bbclass index 8dbaf499..3564ad1f 100644 --- a/classes/qtquickcompiler.bbclass +++ b/classes/qtquickcompiler.bbclass @@ -28,18 +28,18 @@ ############################################################################ python __anonymous() { - provider = "qtquickcompiler" + provider = "" + sdk_path = d.getVar('B2QTBASE', True) + "/recipes-qt/qt5-addons/qtquickcompiler-sdk" + pn = d.getVar("PN", True) - sdk_path = d.getVar('QT_SDK_PATH', True) or "" - if len(sdk_path) != 0: - 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: - provider = "qtquickcompiler-sdk" + if d.getVar('ENABLE_QTQUICKCOMPILER', True) == "1": + provider = "qtquickcompiler" + elif os.path.isdir(sdk_path): + provider = "qtquickcompiler-sdk" + else: + bb.note("qtquickcompiler not enabled for %s" % pn) + return - pn = d.getVar("PN", True) if "toolchain-host" in pn: d.appendVar('RDEPENDS_' + pn, " nativesdk-%s-tools" % provider) if "toolchain-target" in pn: |