Conflicts: mkspecs/qnx-x86-qcc/qplatformdefs.h src/corelib/global/qglobal.h src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp src/opengl/qgl.cpp src/opengl/qglpixelbuffer.cpp src/opengl/qglshaderprogram.cpp tests/auto/opengl/qglthreads/tst_qglthreads.cpp Change-Id: Iaba137884d3526a139000ca26fee02bb27b5cdb5 |
||
|---|---|---|
| .. | ||
| main.cpp | ||
| offscreen.json | ||
| offscreen.pro | ||
| qoffscreencommon.cpp | ||
| qoffscreencommon.h | ||
| qoffscreenintegration.cpp | ||
| qoffscreenintegration.h | ||
| qoffscreenintegration_dummy.cpp | ||
| qoffscreenintegration_x11.cpp | ||
| qoffscreenintegration_x11.h | ||
| qoffscreenwindow.cpp | ||
| qoffscreenwindow.h | ||