qt5base-lts/tests/auto/other/qobjectrace
Liang Qi 3cb7302480 Merge remote-tracking branch 'origin/5.6' into 5.7
Conflicts:
	src/widgets/itemviews/qabstractitemview.cpp
	src/widgets/itemviews/qabstractitemview_p.h

Change-Id: I54589b1365103cb1749186af92aab03a49c94b64
2016-08-01 10:03:21 +02:00
..
.gitignore Moved integrationtests/* into other/ 2011-11-30 09:30:22 +01:00
qobjectrace.pro Tests: Remove CONFIG += parallel_test. 2015-09-05 07:16:50 +00:00
tst_qobjectrace.cpp Merge remote-tracking branch 'origin/5.6' into 5.7 2016-08-01 10:03:21 +02:00