Liang Qi 38c1057f69 Merge remote-tracking branch 'origin/5.6' into 5.7 ... This also reverts commit 0d2f0164f4. Conflicts: header.BSD-NEW qmake/Makefile.win32 src/openglextensions/qopenglextensions.cpp src/openglextensions/qopenglextensions.h src/winmain/qtmain_win.cpp src/winmain/qtmain_winrt.cpp tools/configure/configureapp.cpp util/glgen/qopenglextensions.cpp.header util/glgen/qopenglextensions.h.header Change-Id: If26c6f4111b342378dd88bbdc657e322d2ab6ad8		2016-11-23 09:24:36 +01:00
..
qabstractitemview	Merge remote-tracking branch 'origin/5.6' into 5.7	2016-10-08 17:15:55 +02:00
qcolumnview	Updated license headers	2016-01-21 18:55:18 +00:00
qdatawidgetmapper	Updated license headers	2016-01-21 18:55:18 +00:00
qdirmodel	Remove the traces of the discontinued android-no-sdk platform	2016-03-30 10:12:34 +00:00
qfileiconprovider	Updated license headers	2016-01-21 18:55:18 +00:00
qheaderview	QHeaderView: Reset lastSectionLogicalIdx on clear()	2016-08-09 08:08:30 +00:00
qitemdelegate	Merge remote-tracking branch 'origin/5.6' into 5.7	2016-08-01 10:03:21 +02:00
qitemeditorfactory	Updated license headers	2016-01-21 18:55:18 +00:00
qitemview	Updated license headers	2016-01-21 18:55:18 +00:00
qlistview	Fix tst_QListView::setCurrentIndexAfterAppendRowCrash().	2016-05-24 17:54:13 +00:00
qlistwidget	Merge remote-tracking branch 'origin/5.6' into 5.7	2016-11-23 09:24:36 +01:00
qtableview	Merge remote-tracking branch 'origin/5.6' into 5.7	2016-05-19 12:55:27 +02:00
qtablewidget	Merge remote-tracking branch 'origin/5.6' into 5.7	2016-11-23 09:24:36 +01:00
qtreeview	Merge remote-tracking branch 'origin/5.6' into 5.7	2016-08-05 08:58:48 +02:00
qtreewidget	Updated license headers	2016-01-21 18:55:18 +00:00
qtreewidgetitemiterator	Updated license headers	2016-01-21 18:55:18 +00:00
itemviews.pro	Move QStandardItem/QStandardItemModel to QtGui	2012-06-29 22:42:19 +02:00