Samuel Rødal 2371147354 Merge remote branch 'gerrit/master' into refactor ... Conflicts: src/gui/image/qicon.cpp src/gui/image/qicon.h src/gui/image/qicon_p.h src/gui/text/qfontdatabase.cpp src/plugins/platforms/wayland/gl_integration/qwaylandglwindowsurface.cpp src/plugins/platforms/wayland/gl_integration/wayland_egl/qwaylandglcontext.cpp src/plugins/platforms/wayland/gl_integration/xcomposite_egl/qwaylandxcompositeeglwindow.cpp sync.profile Change-Id: Ie0a23a12177ff51bf562e15b2dd41f071afb19b4		2011-07-12 12:52:22 +02:00
..
animation	Merge remote branch 'staging/master' into refactor	2011-05-24 15:22:06 +02:00
graphicsview	Merge remote branch 'gerrit/master' into refactor	2011-07-12 12:52:22 +02:00
image	Merge remote branch 'staging/master' into refactor	2011-05-24 15:22:06 +02:00
itemviews	Merge remote branch 'staging/master' into refactor	2011-05-24 15:22:06 +02:00
kernel	Merge remote branch 'staging/master' into refactor	2011-05-24 15:22:06 +02:00
math3d	Update licenseheader text in source files for qtbase Qt module	2011-05-24 12:34:08 +03:00
painting	Merge remote branch 'staging/master' into refactor	2011-05-24 15:22:06 +02:00
styles	Merge remote branch 'staging/master' into refactor	2011-05-24 15:22:06 +02:00
text	Merge remote branch 'staging/master' into refactor	2011-05-24 15:22:06 +02:00
gui.pro	Tests: Compile.	2011-05-23 16:49:06 +02:00