kumquat-buildroot/package/qt5
Peter Korsgaard b108fdcb83 Merge branch 'next'
Conflicts:
	Makefile
	package/dmraid/Config.in
	package/gdb/Config.in.host
	package/linux-headers/linux-headers.mk
	package/python/python.mk
	package/python3/python3.mk
	package/rt-tests/Config.in
	package/sdl/sdl.mk
	package/systemd/systemd-01-fix-getty-unit.patch
	package/systemd/systemd-02-fix-page-size.patch
	package/systemd/systemd-03-uclibc-fix.patch
	package/udev/Config.in
	package/udisks/Config.in
	package/vlc/vlc.mk
	system/Config.in

Quite some merge conflicts, hopefully I didn't screw up anything.

Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2014-02-28 14:30:23 +01:00
..
qt5base
qt5connectivity qt5connectivity: Don't build scanner example without QtQuick 2014-02-25 20:58:06 +01:00
qt5declarative
qt5graphicaleffects
qt5imageformats
qt5multimedia
qt5quick1
qt5quickcontrols
qt5script
qt5sensors
qt5serialport
qt5svg
qt5webkit
qt5x11extras
qt5xmlpatterns
Config.in qt5: needs NPTL threads 2014-02-22 23:46:02 +01:00
qt5.mk