qt6-bb10/src/opengl
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
..
doc Whitespace cleanup: remove trailing whitespace 2013-03-16 20:22:50 +01:00
gl2paintengineex Whitespace cleanup: remove trailing whitespace 2013-03-16 20:22:50 +01:00
opengl.pro Introducing the Qt Android port 2013-03-05 08:31:23 +01:00
qgl.cpp Merge branch 'dev' into stable 2013-03-20 13:49:28 +01:00
qgl.h Merge "Merge remote-tracking branch 'origin/stable' into dev" into refs/staging/dev 2013-02-17 20:31:38 +01:00
qgl_p.h Remove duplicated code for handling OpenGL extensions in QtOpenGL 2013-02-17 20:31:30 +01:00
qgl_qpa.cpp Fixed missing support for single buffered OpenGL on OS X. 2013-02-05 09:00:56 +01:00
qglbuffer.cpp Remove duplicated code for handling OpenGL extensions in QtOpenGL 2013-02-17 20:31:30 +01:00
qglbuffer.h Remove QT_{BEGIN,END}_HEADER macro usage 2013-01-29 01:06:04 +01:00
qglcolormap.cpp Update copyright year in Digia's license headers 2013-01-18 09:07:35 +01:00
qglcolormap.h Remove QT_{BEGIN,END}_HEADER macro usage 2013-01-29 01:06:04 +01:00
qglframebufferobject.cpp Merge remote-tracking branch 'origin/stable' into dev 2013-02-18 16:14:52 +01:00
qglframebufferobject.h Remove QT_{BEGIN,END}_HEADER macro usage 2013-01-29 01:06:04 +01:00
qglframebufferobject_p.h Remove duplicated code for handling OpenGL extensions in QtOpenGL 2013-02-17 20:31:30 +01:00
qglfunctions.cpp Remove duplicated code for handling OpenGL extensions in QtOpenGL 2013-02-17 20:31:30 +01:00
qglfunctions.h Remove QT_{BEGIN,END}_HEADER macro usage 2013-01-29 01:06:04 +01:00
qglpaintdevice.cpp Update copyright year in Digia's license headers 2013-01-18 09:07:35 +01:00
qglpaintdevice_p.h Doc: Fix module name format 2013-01-25 17:27:44 +01:00
qglpixelbuffer.cpp Rename function to fix symbol clash in static build 2013-02-11 12:29:05 +01:00
qglpixelbuffer.h Remove QT_{BEGIN,END}_HEADER macro usage 2013-01-29 01:06:04 +01:00
qglpixelbuffer_p.h Update copyright year in Digia's license headers 2013-01-18 09:07:35 +01:00
qglshaderprogram.cpp Remove duplicated code for handling OpenGL extensions in QtOpenGL 2013-02-17 20:31:30 +01:00
qglshaderprogram.h Remove QT_{BEGIN,END}_HEADER macro usage 2013-01-29 01:06:04 +01:00
qgraphicsshadereffect.cpp Update copyright year in Digia's license headers 2013-01-18 09:07:35 +01:00
qgraphicsshadereffect_p.h Remove QT_{BEGIN,END}_HEADER macro usage 2013-01-29 01:06:04 +01:00
qtopenglglobal.h Remove QT_{BEGIN,END}_HEADER macro usage 2013-01-29 01:06:04 +01:00