Liang Qi 0aa2d318b1 Merge remote-tracking branch 'origin/5.5' into dev ... Conflicts: src/corelib/global/qglobal.cpp src/corelib/global/qglobal.h src/corelib/global/qsysinfo.h src/corelib/global/qsystemdetection.h src/corelib/kernel/qobjectdefs.h src/plugins/plugins.pro tests/auto/widgets/itemviews/qlistview/qlistview.pro Change-Id: Ib55aa79d707c4c1453fb9d697f6cf92211ed665c		2015-07-01 11:05:26 +02:00
..
image	Fix boundingRect test in tst_QPicture	2015-06-16 06:11:58 +00:00
itemmodels	Merge remote-tracking branch 'origin/5.5' into dev	2015-07-01 11:05:26 +02:00
kernel	Merge remote-tracking branch 'origin/5.5' into dev	2015-07-01 11:05:26 +02:00
math3d	Introduce QQuaternion::fromDirection()	2015-04-07 13:07:48 +00:00
painting	Merge remote-tracking branch 'origin/5.5' into dev	2015-04-27 21:36:32 +02:00
qopengl	Blacklist and skip various tests that are flakey	2015-06-14 10:50:45 +00:00
qopenglconfig	Add support for driver_description and os.release in GPU blacklists	2015-06-26 15:27:31 +00:00
text	tst_qzip: remove unused init()/cleanup() functions	2015-06-24 12:57:20 +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