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	Moved tests into integrationtests/ and widgets/	2011-10-20 19:45:41 +02:00
BLACKLIST	Tests: Blacklist tests for ubuntu 14.04	2015-04-01 13:59:04 +00:00
qgraphicsproxywidget.pro	Fix autotest on xcb and make it significant again	2015-05-23 11:38:18 +00:00
tst_qgraphicsproxywidget.cpp	Merge remote-tracking branch 'origin/5.5' into dev	2015-07-01 11:05:26 +02:00