Liang Qi 673cdbe1e0 Merge remote-tracking branch 'qt/5.7' into 5.8 ...

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

2016-08-28 10:12:09 +02:00

..

cmake/test_waylandclient

CMake: Create CMake files for WaylandClient

2015-11-02 16:27:34 +00:00

wayland

Merge remote-tracking branch 'qt/5.7' into 5.8

2016-08-28 10:12:09 +02:00