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
..
.gitignore	Move QStandardItem/QStandardItemModel to QtGui	2012-06-29 22:42:19 +02:00
qstandarditem.pro	tests: Remove superfluous gui additions to QT	2014-02-28 17:59:29 +01:00
tst_qstandarditem.cpp	Merge remote-tracking branch 'origin/5.5' into dev	2015-07-01 11:05:26 +02:00