Allan Sandfeld Jensen 1fce111809 Merge remote-tracking branch 'origin/5.4' into merge5.5 ... Conflicts: src/corelib/global/qglobal.h src/corelib/io/qnoncontiguousbytedevice_p.h src/gui/image/qjpeghandler.cpp src/network/access/qhttpthreaddelegate_p.h tests/auto/corelib/io/qlockfile/tst_qlockfile.cpp tests/auto/widgets/widgets/qmenubar/BLACKLIST Change-Id: I01de8c1c28efcedfd7953d05025f54802dc08ab3		2015-05-08 13:26:44 +02:00
..
image	Merge remote-tracking branch 'origin/5.4' into merge5.5	2015-05-08 13:26:44 +02:00
itemmodels	Update copyright headers	2015-02-11 06:49:51 +00:00
kernel	Enable checking for whether the system palette was explicitly set	2015-04-20 06:39:31 +00:00
math3d	Introduce QQuaternion::fromDirection()	2015-04-07 13:07:48 +00:00
painting	Revert "Remove separate SSE4 unpremultiply function"	2015-04-23 09:25:28 +00:00
qopengl	Update copyright headers	2015-02-11 06:49:51 +00:00
qopenglconfig	Add matching by GL_VENDOR to QOpenGLConfig	2015-04-16 16:47:43 +00:00
text	Ensure that CSS rules are inherited from the parent tags	2015-03-25 11:55:47 +00:00
util	Update copyright headers	2015-02-11 06:49:51 +00:00
gui.pro	Add qopenglconfig test.	2015-02-02 23:05:41 +00:00