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
..
qabstractitemview	tests/auto/widgets: Remove some placeholder formatting.	2015-10-19 12:39:16 +00:00
qcolumnview	tests/auto/widgets: Remove some placeholder formatting.	2015-10-19 12:39:16 +00:00
qdatawidgetmapper	tests/auto/widgets: Remove some placeholder formatting.	2015-10-19 12:39:16 +00:00
qdirmodel	Tests: Fix single-character string literals.	2015-10-13 18:14:27 +00:00
qfileiconprovider	Tests: Remove CONFIG += parallel_test.	2015-09-05 07:16:50 +00:00
qheaderview	Merge remote-tracking branch 'origin/5.6' into dev	2015-10-23 14:45:03 +02:00
qitemdelegate	tests/auto/widgets: Replace Q[TRY]_VERIFY(a == b) by Q[TRY]_COMPARE(a, b).	2015-07-31 11:50:10 +00:00
qitemeditorfactory	Tests: Remove CONFIG += parallel_test.	2015-09-05 07:16:50 +00:00
qitemview	tests/auto/widgets: Remove some placeholder formatting.	2015-10-19 12:39:16 +00:00
qlistview	tests/auto/widgets: Remove some placeholder formatting.	2015-10-19 12:39:16 +00:00
qlistwidget	tests/auto/widgets: Remove some placeholder formatting.	2015-10-19 12:39:16 +00:00
qtableview	tests/auto/widgets: Remove some placeholder formatting.	2015-10-19 12:39:16 +00:00
qtablewidget	tests/auto/widgets: Remove some placeholder formatting.	2015-10-19 12:39:16 +00:00
qtreeview	tests/auto/widgets: Remove some placeholder formatting.	2015-10-19 12:39:16 +00:00
qtreewidget	tests/auto/widgets: Remove some placeholder formatting.	2015-10-19 12:39:16 +00:00
qtreewidgetitemiterator	tests/auto/widgets: Remove some placeholder formatting.	2015-10-19 12:39:16 +00:00
itemviews.pro	Move QStandardItem/QStandardItemModel to QtGui	2012-06-29 22:42:19 +02:00