diff options
| author | Samuli Piippo <samuli.piippo@qt.io> | 2016-08-22 15:59:05 +0300 |
|---|---|---|
| committer | Samuli Piippo <samuli.piippo@qt.io> | 2016-08-22 15:59:05 +0300 |
| commit | 83b656eb3219ee37d95d6453d692562406fe7be0 (patch) | |
| tree | 47b52b59932c23c4e9cfeb8bfc0a3e75c23117de /classes | |
| parent | 1778a81a6d214b27f20cb5242b28d5c41fbbf5b6 (diff) | |
| parent | 797b8c96bd53cd15b6540a989353f89d285c8de9 (diff) | |
Merge remote-tracking branch 'origin/fido' into jethro
* origin/fido:
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
Correctly use QtQuickCompiler when available
Change git protocol from ssh to http
Update qtdeclarative module
Update boot2qt-demos version
Conflicts:
conf/distro/b2qt-auto.conf
recipes-qt/automotive/gammaray_git.bb
recipes-qt/automotive/neptune-ui/neptune.service
recipes-qt/automotive/neptune-ui_git.bb
recipes-qt/automotive/qtapplicationmanager_git.bb
recipes-qt/automotive/qtivi_git.bb
recipes-qt/automotive/qtwebbrowser_git.bb
recipes-qt/b2qt-addons/b2qt-demos.bb
recipes-qt/b2qt-addons/b2qt-launcher.bb
recipes-qt/b2qt-addons/democompositor_git.bb
recipes-qt/images/b2qt-automotive-qt5-image.bb
recipes-qt/meta/meta-toolchain-b2qt-automotive-qt5-sdk.bb
recipes-qt/qt5-addons/qtvirtualkeyboard_git.bb
recipes-qt/qt5/nativesdk-qtbase_git.bbappend
recipes-qt/qt5/qt3d_git.bbappend
recipes-qt/qt5/qtbase-native_git.bbappend
recipes-qt/qt5/qtbase_git.bbappend
recipes-qt/qt5/qtcanvas3d_git.bbappend
recipes-qt/qt5/qtcharts_git.bb
recipes-qt/qt5/qtconnectivity_git.bbappend
recipes-qt/qt5/qtdatavis3d_git.bb
recipes-qt/qt5/qtdeclarative-render2d_git.bb
recipes-qt/qt5/qtdeclarative_git.bbappend
recipes-qt/qt5/qtgraphicaleffects_git.bbappend
recipes-qt/qt5/qtimageformats_git.bbappend
recipes-qt/qt5/qtlocation_git.bbappend
recipes-qt/qt5/qtmultimedia_git.bbappend
recipes-qt/qt5/qtquickcompiler_git.bb
recipes-qt/qt5/qtquickcontrols2_git.bb
recipes-qt/qt5/qtquickcontrols_git.bbappend
recipes-qt/qt5/qtsensors_git.bbappend
recipes-qt/qt5/qtserialbus_git.bb
recipes-qt/qt5/qtserialport_git.bbappend
recipes-qt/qt5/qtsvg_git.bbappend
recipes-qt/qt5/qttools_git.bbappend
recipes-qt/qt5/qttranslations_git.bbappend
recipes-qt/qt5/qtvirtualkeyboard_git.bb
recipes-qt/qt5/qtvirtualkeyboard_git.bbappend
recipes-qt/qt5/qtwayland-native_5.7-wip.bb
recipes-qt/qt5/qtwayland-native_git.bbappend
recipes-qt/qt5/qtwayland_5.7-wip.bb
recipes-qt/qt5/qtwayland_git.bbappend
recipes-qt/qt5/qtwebchannel_git.bbappend
recipes-qt/qt5/qtwebengine_git.bbappend
recipes-qt/qt5/qtwebsockets_git.bbappend
recipes-qt/qt5/qtxmlpatterns_git.bbappend
scripts/manifest.xml
Change-Id: Ibf7f89a35c9e19bd8cf81c49cb44f6fd454838b4
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: |