qt5base-lts/tests/auto/opengl/qglfunctions
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
..
qglfunctions.pro add and use qtHaveModule() function 2012-12-21 19:05:02 +01:00
tst_qglfunctions.cpp Merge remote-tracking branch 'origin/stable' into dev 2014-05-06 16:50:03 +02:00