Liang Qi c334c5b58d Merge remote-tracking branch 'origin/5.6' into 5.7 ...

Conflicts:
	src/compositor/compositor_api/qwaylandcompositor.h
	src/compositor/compositor_api/qwaylandquickcompositor.h
	src/compositor/compositor_api/qwaylandsurfaceitem.h
	src/compositor/windowmanagerprotocol/waylandwindowmanagerintegration_p.h

Change-Id: I094128be314d2c3d4fe350fa7a162e37da34ae10

2016-03-22 19:05:17 +01:00

src

Merge remote-tracking branch 'origin/5.6' into 5.7

2016-03-22 19:05:17 +01:00

tests/auto

Updated license headers

2016-01-20 10:53:53 +00: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%