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
No related branches found
No related tags found
Showing
- classes/internal-build.bbclass 1 addition, 0 deletionsclasses/internal-build.bbclass
- classes/qtquickcompiler.bbclass 10 additions, 10 deletionsclasses/qtquickcompiler.bbclass
- conf/distro/b2qt-auto.conf 0 additions, 33 deletionsconf/distro/b2qt-auto.conf
- conf/local.conf.sample 3 additions, 0 deletionsconf/local.conf.sample
- recipes-qt/b2qt-addons/b2qt-demos.bb 3 additions, 3 deletionsrecipes-qt/b2qt-addons/b2qt-demos.bb
- recipes-qt/b2qt-addons/b2qt-launcher.bb 4 additions, 6 deletionsrecipes-qt/b2qt-addons/b2qt-launcher.bb
- recipes-qt/b2qt-addons/democompositor_git.bb 2 additions, 5 deletionsrecipes-qt/b2qt-addons/democompositor_git.bb
- recipes-qt/qt5/qtquickcompiler_git.bb 0 additions, 0 deletionsrecipes-qt/qt5/qtquickcompiler_git.bb
- scripts/update-qt5-modules.sh 3 additions, 0 deletionsscripts/update-qt5-modules.sh
Loading
Please register or sign in to comment