Liang Qi ce9519593a Merge remote-tracking branch 'origin/5.4' into 5.5 ... Conflicts: mkspecs/android-g++/qmake.conf qmake/generators/unix/unixmake2.cpp src/gui/image/qimage_conversions.cpp Change-Id: Ib76264b8c2d29a0228438ec02bd97d4b97545be0		2015-03-31 10:03:31 +02:00
..
image	Merge remote-tracking branch 'origin/5.4' into 5.5	2015-03-31 10:03:31 +02:00
itemmodels	Update copyright headers	2015-02-11 06:49:51 +00:00
kernel	tst_QWindow::initialSize: Use showNormal() instead of show()	2015-03-12 00:10:27 +00:00
math3d	Introduce QQuaternion::rotationTo(vecFrom, vecTo)	2015-03-07 01:14:15 +00:00
painting	Merge remote-tracking branch 'origin/5.4' into 5.5	2015-03-31 10:03:31 +02:00
qopengl	Update copyright headers	2015-02-11 06:49:51 +00:00
qopenglconfig	Add support for GPU bug list reading.	2015-02-14 16:23:47 +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