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

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

* origin/fido:
  otf-noto: update url and license file name
  qtmultimedia: make sure audio plugins are built
  qt5: update submodules and meta-qt5

Conflicts:
	conf/distro/b2qt.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/qtconnectivity_git.bbappend
	recipes-qt/qt5/qtdeclarative_git.bbappend
	recipes-qt/qt5/qtlocation_git.bbappend
	recipes-qt/qt5/qtmultimedia_git.bbappend
	recipes-qt/qt5/qtquickcontrols2_git.bb
	recipes-qt/qt5/qtquickcontrols_git.bbappend
	recipes-qt/qt5/qtserialbus_git.bb
	recipes-qt/qt5/qtsvg_git.bbappend
	recipes-qt/qt5/qttools_git.bbappend
	recipes-qt/qt5/qttranslations_git.bbappend
	recipes-qt/qt5/qtwayland-native_git.bbappend
	recipes-qt/qt5/qtwayland_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: I54a02e91a49a3be3fa6359b5af69929d63b962e4
parents d55a3a4f ab471419
No related branches found
No related tags found
Loading
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