AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
6302d6eef7
qt5base-lts/tests/auto/opengl
History
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
..
qgl Merge remote-tracking branch 'origin/stable' into dev 2014-05-06 16:50:03 +02:00
qglbuffer QNX: Skip QGLBuffer autotest 2014-04-14 20:03:30 +02:00
qglfunctions Merge remote-tracking branch 'origin/stable' into dev 2014-05-06 16:50:03 +02:00
qglthreads Merge remote-tracking branch 'origin/stable' into dev 2014-05-06 16:50:03 +02:00
opengl.pro