qt/qtwayland.git - A toolbox for making Qt based Wayland compositors

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge remote-tracking branch 'qt/5.7' into 5.8v5.8.0-alpha1	Liang Qi	2016-08-28	1	-3/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: src/compositor/compositor_api/qwaylandseat.cpp src/compositor/compositor_api/qwaylandview.cpp tests/auto/compositor/compositor.pro tests/auto/compositor/compositor/testinputdevice.cpp tests/auto/compositor/compositor/testinputdevice.h tests/auto/compositor/testinputdevice.cpp tests/auto/compositor/testinputdevice.h tests/auto/compositor/testseat.cpp tests/auto/compositor/testseat.h Change-Id: I98e045908dd964e5d4120bd35e71b8839c0d923a
*	Merge remote-tracking branch 'origin/5.6' into 5.7	Liang Qi	2016-08-23	1	-20/+27
\| \| \| \| \| \| \| \|	Conflicts: tests/auto/compositor/compositor.pro tests/auto/compositor/compositor/compositor.pro Change-Id: Id9f3cf97ca3b600bdafba846908643ff0f8964b9
*	Fix autotest directory structure	Paul Olav Tvete	2016-08-19	1	-0/+47
	The client and server parts are separate modules, so they need separate top-level directories under tests/auto. This also makes it easier to add new tests later. Change-Id: I393341b6f4e8fc3afa480653f3482192e002e425 Reviewed-by: Giulio Camuffo <giulio.camuffo@kdab.com>