Frederik Gladhorn 1326cd15f7 Merge remote-tracking branch 'origin/stable' into dev ... 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		2014-05-06 16:50:03 +02:00
..
.gitignore	Moved autotests in category 'opengl' into new directory structure	2011-09-09 10:32:38 +02:00
qgl.pro	Mark tst_qgl as insignificant in angle build	2013-11-12 07:11:07 +01:00
qgl.qrc	Moved autotests in category 'opengl' into new directory structure	2011-09-09 10:32:38 +02:00
tst_qgl.cpp	Merge remote-tracking branch 'origin/stable' into dev	2014-05-06 16:50:03 +02:00