Conflicts: src/gui/text/qtextengine.cpp tests/auto/corelib/itemmodels/qsortfilterproxymodel_common/tst_qsortfilterproxymodel.cpp tests/auto/corelib/itemmodels/qsortfilterproxymodel_common/tst_qsortfilterproxymodel.h Change-Id: Ib9f968edbb0f3387c89bc25e914321d0738bfadc |
||
|---|---|---|
| .. | ||
| qabstractitemmodel | ||
| qabstractproxymodel | ||
| qidentityproxymodel | ||
| qitemmodel | ||
| qitemselectionmodel | ||
| qsortfilterproxymodel_common | ||
| qsortfilterproxymodel_recursive | ||
| qsortfilterproxymodel_regexp | ||
| qsortfilterproxymodel_regularexpression | ||
| qstringlistmodel | ||
| itemmodels.pro | ||