Conflicts: configure qmake/generators/mac/pbuilder_pbx.cpp src/corelib/kernel/qtimerinfo_unix.cpp src/plugins/platforms/cocoa/qcocoabackingstore.mm src/plugins/platforms/cocoa/qcocoawindow.mm src/plugins/platforms/windows/qwindowswindow.cpp src/plugins/platforms/xcb/qglxintegration.cpp Change-Id: I8d125fe498f5304874e6976b53f588d3e98a66ac |
||
|---|---|---|
| .. | ||
| qabstractitemmodel | ||
| qabstractproxymodel | ||
| qidentityproxymodel | ||
| qitemmodel | ||
| qitemselectionmodel | ||
| qsortfilterproxymodel | ||
| qstringlistmodel | ||
| itemmodels.pro | ||