Conflicts: mkspecs/qws/linux-lsb-g++/qmake.conf src/gui/image/qpixmap_mac.cpp src/gui/painting/qpaintengine_x11.cpp src/gui/painting/qtessellator.cpp src/gui/text/qfontengine_qws.cpp src/gui/text/qfontengine_x11.cpp src/gui/widgets/qlinecontrol.cpp src/opengl/qgl.h src/opengl/qgl_x11egl.cpp src/plugins/plugins.pro Change-Id: If52dcd55cd55f2983a756c2f843967702b60a310 |
||
|---|---|---|
| .. | ||
| createpackage | ||
| createpackage.bat | ||
| createpackage.pl | ||
| elf2e32_qtwrapper | ||
| elf2e32_qtwrapper.bat | ||
| elf2e32_qtwrapper.pl | ||
| findtr | ||
| fixqt4headers | ||
| patch_capabilities | ||
| patch_capabilities.bat | ||
| patch_capabilities.pl | ||
| qtmodule-configtests | ||
| setcepaths.bat | ||
| syncqt | ||
| syncqt.bat | ||