Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | Merge remote branch 'origin/master' into refactor | Lars Knoll | 2011-05-16 | 1 | -2/+2 | |
| | | | | | | Conflicts: src/modules/qt_openvg.pri src/widgets/to_be_moved/qlinecontrol_p.h | |||||
* | Merge remote branch 'staging/master' into refactor | Samuel Rødal | 2011-05-11 | 3 | -15/+271 | |
| | | | | | | | | | | | | | | | 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 | |||||
* | fix includes | Lars Knoll | 2011-05-07 | 5 | -6/+6 | |
| | ||||||
* | library split | Lars Knoll | 2011-05-07 | 19 | -0/+8818 | |