5e2b0aa1b3
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 |
||
---|---|---|
.. | ||
createpackage | ||
createpackage.bat | ||
createpackage.pl | ||
elf2e32_qtwrapper | ||
elf2e32_qtwrapper.bat | ||
elf2e32_qtwrapper.pl | ||
findtr | ||
fixqt4headers | ||
patch_capabilities | ||
patch_capabilities.bat | ||
patch_capabilities.pl | ||
setcepaths.bat | ||
syncqt | ||
syncqt.bat |