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

src

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

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

tests/auto

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

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

Description

Qt Base (Core, Gui, Widgets, Network, ...)

c-plus-plusqtqt5

822 MiB

Languages

C++ 84.3%

HTML 4.9%

C 3.9%

CMake 3.6%

Objective-C++ 2%

Other 0.8%