summaryrefslogtreecommitdiffstats
path: root/meta-smx6-extras
diff options
context:
space:
mode:
authorSamuli Piippo <samuli.piippo@qt.io>2016-10-31 09:12:03 +0200
committerSamuli Piippo <samuli.piippo@qt.io>2016-10-31 09:12:03 +0200
commitff5338d5189d60fe91d842fe1be26bd69a042f96 (patch)
treefcdad806b1aab2dc83982779e5fa774cc59d5108 /meta-smx6-extras
parent17bb365744a233dba7483be2c86b34a8c17f125a (diff)
parent18c5cb7ecea53c07682ddfeda821e4fd32a14328 (diff)
downloadmeta-boot2qt-ff5338d5189d60fe91d842fe1be26bd69a042f96.tar.gz
Merge remote-tracking branch 'origin/jethro' into dev
* origin/jethro: VKB: correctly override PACKAGECONFIG psplash: remove from image imx6: enable QT_QPA_EGLFS_FORCEVSYNC for all imx6 devices colibri-vf: use older 4.1 version of kernel to fix color issue colibri-imx7: add u-boot-nand.imx to image colibri-vf: add kernel image to rootfs dbus-session-init: fix broken init script Improve repo fetching qt5 recipes cleanup qt5: update submodules qt5: remove obsolete file 0001-Allow-a-tools-only-build.patch Conflicts: meta-raspberrypi-extras/recipes/bluez5/bluez5_%.bbappend 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.bbappend recipes-qt/qt5/qtconnectivity_git.bbappend 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/qtquickcontrols2_git.bbappend recipes-qt/qt5/qtquickcontrols_git.bbappend recipes-qt/qt5/qtsensors_git.bbappend recipes-qt/qt5/qtserialbus_git.bbappend 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.bbappend 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: I089e7d3667ac4ed150cc5c2201c2505103f548ee
Diffstat (limited to 'meta-smx6-extras')
0 files changed, 0 insertions, 0 deletions