Liang Qi d0a0a3c041 Merge remote-tracking branch 'origin/5.10' into dev ... Conflicts: examples/network/fortuneclient/client.cpp examples/network/fortuneserver/server.cpp src/platformsupport/platformcompositor/qopenglcompositorbackingstore_p.h src/plugins/platforms/cocoa/qcocoabackingstore.h src/plugins/platforms/cocoa/qcocoaintegration.h src/plugins/platforms/cocoa/qcocoascreen.h src/plugins/platforms/ios/qiosbackingstore.h src/plugins/sqldrivers/oci/qsql_oci.cpp src/widgets/kernel/qwidgetwindow.cpp Change-Id: Ia6dd2c52d4a691b671cf9a2ffca70deccece8f10		2017-10-17 10:34:24 +02:00
..
qabstractitemview	Merge remote-tracking branch 'origin/5.10' into dev	2017-10-17 10:34:24 +02:00
qcolumnview	tests/auto/widgets: use QCOMPARE(., nullptr)	2016-11-30 07:24:47 +00:00
qdatawidgetmapper	tests/auto/widgets: use QCOMPARE(., nullptr)	2016-11-30 07:24:47 +00:00
qdirmodel	Remove remains of wince in .pro files	2017-07-03 05:32:51 +00:00
qfileiconprovider	Updated license headers	2016-01-21 18:55:18 +00:00
qheaderview	Replace Q_DECL_OVERRIDE with override where possible	2017-09-19 11:53:42 +00:00
qitemdelegate	Merge remote-tracking branch 'origin/5.9' into 5.10	2017-10-04 13:41:04 +02:00
qitemeditorfactory	Updated license headers	2016-01-21 18:55:18 +00:00
qitemview	QtWidgets: Remove Windows CE.	2016-04-07 10:24:45 +00:00
qlistview	Merge remote-tracking branch 'origin/5.10' into dev	2017-10-17 10:34:24 +02:00
qlistwidget	Fix tst_QListWidget::QTBUG50891_ensureSelectionModelSignalConnectionsAreSet	2017-07-21 22:10:28 +00:00
qtableview	Use QSharedPointer::create() more	2017-07-19 13:40:42 +00:00
qtablewidget	tests/auto/widgets: use QCOMPARE(., nullptr)	2016-11-30 07:24:47 +00:00
qtreeview	Merge remote-tracking branch 'origin/5.10' into dev	2017-10-17 10:34:24 +02:00
qtreewidget	Replace Q_NULLPTR with nullptr where possible	2017-09-19 11:53:55 +00:00
qtreewidgetitemiterator	tests/auto/widgets: use QCOMPARE(., nullptr)	2016-11-30 07:24:47 +00:00
itemviews.pro	Use qtConfig throughout in qtbase	2016-08-19 04:28:05 +00:00