Liang Qi 790aef362f Merge remote-tracking branch 'origin/5.6' into dev ... Conflicts: .qmake.conf configure src/corelib/global/qglobal.h src/tools/qdoc/node.cpp src/tools/qdoc/qdocdatabase.cpp tests/auto/corelib/io/qsettings/tst_qsettings.cpp tools/configure/configureapp.cpp Change-Id: I66028ae5e441a06b73ee85ba72a03a3af3e8593f		2015-10-23 14:45:03 +02:00
..
.gitignore	Moved tests into integrationtests/ and widgets/	2011-10-20 19:45:41 +02:00
qheaderview.pro	Set the Qt API level to compatibility mode in all tests.	2012-08-01 15:37:46 +02:00
tst_qheaderview.cpp	Merge remote-tracking branch 'origin/5.6' into dev	2015-10-23 14:45:03 +02:00