qt/qtbase.git - Qt Base (Core, Gui, Widgets, Network, ...)

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge remote branch 'origin/master' into refactor	Lars Knoll	2011-05-12	1	-0/+5
\| \| \| \| \| \| \| \|	Conflicts: src/gui/gui.pro src/gui/painting/painting.pri src/opengl/opengl.pro src/openvg/openvg.pro
*	Merge remote branch 'staging/master' into refactor	Samuel Rødal	2011-05-11	1	-1/+10
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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
*	library split	Lars Knoll	2011-05-07	1	-0/+1450