Frederik Gladhorn 34b14a8472 Merge remote-tracking branch 'origin/5.4' into 5.5 ... Conflicts: examples/xml/htmlinfo/simpleexample.html examples/xml/rsslisting/rsslisting.cpp qmake/generators/win32/msbuild_objectmodel.cpp src/3rdparty/harfbuzz-ng/src/hb-private.hh src/corelib/global/qlogging.cpp src/corelib/io/qstorageinfo_unix.cpp src/corelib/thread/qwaitcondition_unix.cpp src/gui/kernel/qguiapplication.cpp src/plugins/platforms/linuxfb/qlinuxfbintegration.cpp src/testlib/doc/src/qt-webpages.qdoc tests/auto/other/qaccessibility/tst_qaccessibility.cpp Change-Id: Ib272ff0bc30a1a5d51275eb3cd2f201dc82c11ff		2015-02-24 21:02:08 +01:00
..
doc	Updated BSD licensed file headers	2015-02-15 07:41:17 +00:00
gl2paintengineex	Use C++ <cmath> instead of <math.h>	2015-02-16 16:21:15 +00:00
opengl.pro	qpa: Merge qgl_qpa.cpp into qgl.cpp	2014-05-15 02:51:06 +02:00
qgl.cpp	Merge remote-tracking branch 'origin/5.4' into 5.5	2015-02-24 21:02:08 +01:00
qgl.h	Update copyright headers	2015-02-11 06:49:51 +00:00
qgl_p.h	Update copyright headers	2015-02-11 06:49:51 +00:00
qglbuffer.cpp	Update copyright headers	2015-02-11 06:49:51 +00:00
qglbuffer.h	Update copyright headers	2015-02-11 06:49:51 +00:00
qglcolormap.cpp	Merge remote-tracking branch 'origin/5.4' into 5.5	2015-02-24 21:02:08 +01:00
qglcolormap.h	Update copyright headers	2015-02-11 06:49:51 +00:00
qglframebufferobject.cpp	Update copyright headers	2015-02-11 06:49:51 +00:00
qglframebufferobject.h	Update copyright headers	2015-02-11 06:49:51 +00:00
qglframebufferobject_p.h	Update copyright headers	2015-02-11 06:49:51 +00:00
qglfunctions.cpp	Update copyright headers	2015-02-11 06:49:51 +00:00
qglfunctions.h	Update copyright headers	2015-02-11 06:49:51 +00:00
qglpaintdevice.cpp	Update copyright headers	2015-02-11 06:49:51 +00:00
qglpaintdevice_p.h	Update copyright headers	2015-02-11 06:49:51 +00:00
qglpixelbuffer.cpp	Update copyright headers	2015-02-11 06:49:51 +00:00
qglpixelbuffer.h	Update copyright headers	2015-02-11 06:49:51 +00:00
qglpixelbuffer_p.h	Update copyright headers	2015-02-11 06:49:51 +00:00
qglshaderprogram.cpp	Update copyright headers	2015-02-11 06:49:51 +00:00
qglshaderprogram.h	Update copyright headers	2015-02-11 06:49:51 +00:00
qgraphicsshadereffect.cpp	Update copyright headers	2015-02-11 06:49:51 +00:00
qgraphicsshadereffect_p.h	Update copyright headers	2015-02-11 06:49:51 +00:00
qtopenglglobal.h	Update copyright headers	2015-02-11 06:49:51 +00:00