Frederik Gladhorn 77da617dc8 Merge remote-tracking branch 'origin/5.5' into dev ... Conflicts: doc/global/qt-cpp-defines.qdocconf src/3rdparty/forkfd/forkfd.c src/corelib/codecs/qtextcodec.cpp src/corelib/kernel/qmetatype.cpp src/corelib/tools/qset.qdoc src/gui/accessible/qaccessible.cpp src/gui/image/qpixmapcache.cpp src/opengl/qgl.cpp src/tools/qdoc/generator.cpp src/widgets/kernel/qwidget.cpp tests/auto/widgets/widgets/qcombobox/tst_qcombobox.cpp Change-Id: I4fbe1fa756a54c6843aa75f4ef70a1069ba7b085		2015-08-06 10:54:01 +02:00
..
image	Merge remote-tracking branch 'origin/5.5' into dev	2015-08-06 10:54:01 +02:00
itemmodels	Merge remote-tracking branch 'origin/5.5' into dev	2015-07-01 11:05:26 +02:00
kernel	tests/auto/gui: Replace Q[TRY]_VERIFY(a == b) by Q[TRY]_COMPARE(a, b).	2015-07-31 08:29:15 +00:00
math3d	tests/auto/gui: Replace Q[TRY]_VERIFY(a == b) by Q[TRY]_COMPARE(a, b).	2015-07-31 08:29:15 +00:00
painting	tests/auto/gui: Replace Q[TRY]_VERIFY(a == b) by Q[TRY]_COMPARE(a, b).	2015-07-31 08:29:15 +00:00
qopengl	Support MRT in QOpenGLFramebufferObject	2015-07-29 07:54:13 +00:00
qopenglconfig	Add support for driver_description and os.release in GPU blacklists	2015-06-26 15:27:31 +00:00
text	Merge remote-tracking branch 'origin/5.5' into dev	2015-08-06 10:54:01 +02:00
util	tests/auto/gui: Replace Q[TRY]_VERIFY(a == b) by Q[TRY]_COMPARE(a, b).	2015-07-31 08:29:15 +00:00
gui.pro	Add qopenglconfig test.	2015-02-02 23:05:41 +00:00