Skip to content
Snippets Groups Projects
Commit f73f0018 authored by Samuli Piippo's avatar Samuli Piippo
Browse files

Merge remote-tracking branch 'origin/jethro' into dev

* origin/jethro:
  Always append to MACHINE_EXTRA_INSTALL
  qt5: update submodules
  Enable dbus by default for neptune ui
  qt5: update submodules
  Add connman patch to disable connman with boot over nfs
  Update dbus-session-init to work with systemd

Conflicts:
	conf/distro/include/am335x-evm.conf
	conf/distro/include/beaglebone.conf
	conf/distro/include/nvidia-logan.conf
	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/qtcharts_git.bbappend
	recipes-qt/qt5/qtconnectivity_git.bbappend
	recipes-qt/qt5/qtdeclarative-render2d_git.bbappend
	recipes-qt/qt5/qtdeclarative_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.bbappend
	recipes-qt/qt5/qtquickcontrols_git.bbappend
	recipes-qt/qt5/qtsvg_git.bbappend
	recipes-qt/qt5/qttools_git.bbappend
	recipes-qt/qt5/qtwayland-native_git.bbappend
	recipes-qt/qt5/qtwayland_git.bbappend
	recipes-qt/qt5/qtwebengine_git.bbappend
	recipes-qt/qt5/qtxmlpatterns_git.bbappend

Change-Id: Ia73290b54a213a9670baab11e14522956e7bfec0
parents c1bd2a95 415e9f87
No related branches found
No related tags found
Loading
Showing
with 108 additions and 23 deletions
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment