qt5base-lts/tools
Samuel Rødal d671acd5b2 Merge remote branch 'staging/master' into refactor
Conflicts:
	src/opengl/qgl_qpa.cpp
	src/plugins/platforms/glxconvenience/qglxconvenience.cpp
	src/plugins/platforms/platforms.pro
	src/plugins/platforms/wayland/qwaylandwindow.cpp
	src/plugins/platforms/xcb/qxcbwindow.cpp
	src/plugins/platforms/xcb/qxcbwindow.h
	src/plugins/platforms/xcb/qxcbwindowsurface.cpp
	src/widgets/kernel/qwidget_qpa.cpp
	tests/auto/qvariant/tst_qvariant.cpp
2011-05-20 19:46:19 +02:00
..
configure Fix the build of configure.exe. 2011-05-10 12:54:54 +02:00
shared Initial import from the monolithic Qt. 2011-04-27 12:05:43 +02:00
uilib Merge remote branch 'staging/master' into refactor 2011-05-20 19:46:19 +02:00