Liang Qi 9fc54bf67c Merge remote-tracking branch 'origin/5.8' into dev ...

Conflicts:
	.qmake.conf
	examples/wayland/custom-extension/client-common/main.cpp
	src/client/qwaylandwlshellintegration_p.h
	src/client/qwaylandxdgshellintegration_p.h
	src/compositor/compositor_api/qwaylandquickoutput.h
	src/plugins/shellintegration/ivi-shell/qwaylandivisurface_p.h

Change-Id: Ic78c610ddf102b0a185294f625bbfcb9238b0f3c

2017-01-25 12:19:40 +01:00

src

Merge remote-tracking branch 'origin/5.8' into dev

2017-01-25 12:19:40 +01:00

tests/auto

Merge remote-tracking branch 'origin/5.8' into dev

2017-01-25 12:19:40 +01: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%