Giulio Camuffo ab56b7a11f Merge branch '5.4' into dev ...

Merge done by Giulio Camuffo

Conflicts:
	src/client/client.pro
	src/client/qwaylanddisplay.cpp
	src/client/qwaylandinputdevice.cpp
	src/client/qwaylandinputdevice_p.h
	src/client/qwaylandwindow.cpp
	src/compositor/compositor_api/qwaylandsurface.cpp
	src/compositor/compositor_api/qwaylandsurface_p.h
	src/compositor/wayland_wrapper/qwlsurface.cpp

Change-Id: I1df878bb54f49d953c51215a2772869e261ebe81

2014-11-15 18:46:38 +01:00

src

Merge branch '5.4' into dev

2014-11-15 18:46:38 +01:00

tests/auto/wayland

Fix the compositor's wayland versioning

2014-10-09 09:40:10 +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%