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
..
image	Introducing QPixelFormat	2014-04-23 21:43:50 +02:00
itemmodels	tests: Remove superfluous gui additions to QT	2014-02-28 17:59:29 +01:00
kernel	Merge remote-tracking branch 'origin/stable' into dev	2014-05-06 16:50:03 +02:00
math3d	Add operator[] to QVectorND classes	2013-08-27 17:50:40 +02:00
painting	Merge remote-tracking branch 'origin/stable' into dev	2014-04-11 14:36:55 +02:00
qopengl	Remove direct OpenGL calls from QtOpenGL	2014-04-28 18:19:34 +02:00
text	Merge remote-tracking branch 'origin/stable' into dev	2014-05-06 16:50:03 +02:00
util	Bugfix QDesktopServices on Windows	2013-07-11 10:56:49 +02:00
gui.pro	purge vestiges of opengl es 1 support	2014-04-04 19:32:21 +02:00