a503bf5470
Conflicts:
src/corelib/tools/qvector.h
Make QVector(DataPointer dd) public to be able to properly merge
|
||
---|---|---|
.. | ||
qabstractitemview | ||
qcolumnview | ||
qdatawidgetmapper | ||
qdirmodel | ||
qfileiconprovider | ||
qheaderview | ||
qitemdelegate | ||
qitemeditorfactory | ||
qitemview | ||
qlistview | ||
qlistwidget | ||
qtableview | ||
qtablewidget | ||
qtreeview | ||
qtreewidget | ||
qtreewidgetitemiterator | ||
itemviews.pro |