Samuel Rødal 5e2b0aa1b3 Merge remote branch 'staging/master' into refactor ... Conflicts: src/gui/painting/qdrawhelper_p.h src/gui/painting/qgraphicssystemfactory.cpp src/gui/painting/qpainter.cpp src/gui/painting/qunifiedtoolbarsurface_mac.cpp src/gui/painting/qunifiedtoolbarsurface_mac_p.h src/openvg/openvg.pro src/openvg/qpaintengine_vg.cpp src/openvg/qwindowsurface_vg.cpp src/openvg/qwindowsurface_vgegl.cpp src/plugins/platforms/wayland/qwaylanddisplay.cpp src/widgets/graphicsview/qgraphicsscene.cpp		2011-05-11 12:39:09 +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-11 12:39:09 +02:00