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
..
animation	Extend tst_QPauseAnimation::pauseAndPropertyAnimations blacklist	2015-06-20 15:25:58 +00:00
codecs	fix usage of wince scope	2015-06-05 10:29:10 +00:00
global	Merge remote-tracking branch 'origin/5.5' into dev	2015-07-01 11:05:26 +02:00
io	Merge remote-tracking branch 'origin/5.5' into dev	2015-07-01 11:05:26 +02:00
itemmodels	Merge remote-tracking branch 'origin/5.5' into dev	2015-07-01 11:05:26 +02:00
json	Make sure remove() doesn't corrupt the json object	2015-03-18 07:34:59 +00:00
kernel	Merge remote-tracking branch 'origin/5.5' into dev	2015-07-01 11:05:26 +02:00
mimetypes	Merge remote-tracking branch 'origin/5.4' into 5.5	2015-03-31 10:03:31 +02:00
plugin	Merge remote-tracking branch 'origin/5.5' into dev	2015-07-01 11:05:26 +02:00
statemachine	tst_QStateMachine: replace inefficient QLists with QVector	2015-06-17 07:10:11 +00:00
thread	Merge remote-tracking branch 'origin/5.5' into dev	2015-07-01 11:05:26 +02:00
tools	Merge remote-tracking branch 'origin/5.5' into dev	2015-07-01 11:05:26 +02:00
xml	Update copyright headers	2015-02-11 06:49:51 +00:00
corelib.pro	iOS: Enable building of basic tests	2014-01-22 12:35:17 +01:00