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 |
||
|---|---|---|
| .. | ||
| integrity-ghs | ||
| linux-armcc | ||
| linux-clang | ||
| linux-host-g++ | ||
| linux-scratchbox2-g++ | ||
| macx-clang | ||
| qnx-g++ | ||
| qws | ||
| vxworks-ppc-dcc | ||
| vxworks-ppc-g++ | ||
| vxworks-simpentium-dcc | ||
| vxworks-simpentium-g++ | ||
| win32-g++-cross | ||