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 |
||
|---|---|---|
| .. | ||
| qabstractitemview | ||
| qcolumnview | ||
| qdatawidgetmapper | ||
| qdirmodel | ||
| qfileiconprovider | ||
| qheaderview | ||
| qitemdelegate | ||
| qitemeditorfactory | ||
| qitemview | ||
| qlistview | ||
| qlistwidget | ||
| qtableview | ||
| qtablewidget | ||
| qtreeview | ||
| qtreewidget | ||
| qtreewidgetitemiterator | ||
| itemviews.pro | ||