Oswald Buddenhagen 76c0be34cd Merge branch 'dev' into stable ... This starts Qt 5.1 release cycle Conflicts: src/gui/text/qfontdatabase.cpp src/gui/text/qharfbuzz_copy_p.h src/widgets/kernel/qapplication.cpp src/widgets/kernel/qcoreapplication.cpp Change-Id: I72fbf83ab3c2206aeea1b089428b0fc2a89bd62b		2013-03-20 13:49:28 +01:00
..
qgl	Merge remote-tracking branch 'origin/release' into stable	2013-03-08 16:11:33 +01:00
qglbuffer	Remove duplicated code for handling OpenGL extensions in QtOpenGL	2013-02-17 20:31:30 +01:00
qglfunctions	Update copyright year in Digia's license headers	2013-01-18 09:07:35 +01:00
qglthreads	Update copyright year in Digia's license headers	2013-01-18 09:07:35 +01:00
opengl.pro	Moved tests into gui/kernel/ and gui/qopengl/	2011-11-04 20:48:19 +01:00