diff --git a/examples/contactlistwidgets.cpp b/examples/contactlistwidgets.cpp --- a/examples/contactlistwidgets.cpp +++ b/examples/contactlistwidgets.cpp @@ -60,7 +60,7 @@ painter->save(); - painter->setRenderHints(QPainter::Antialiasing | QPainter::SmoothPixmapTransform | QPainter::HighQualityAntialiasing); + painter->setRenderHints(QPainter::Antialiasing | QPainter::SmoothPixmapTransform); painter->setClipRect(optV4.rect); QStyle *style = QApplication::style(); diff --git a/src/widgets/mergedelegate.cpp b/src/widgets/mergedelegate.cpp --- a/src/widgets/mergedelegate.cpp +++ b/src/widgets/mergedelegate.cpp @@ -88,9 +88,10 @@ QWidget *MergeDelegate::buildMultipleLineLabel(const QModelIndex &idx) { QString contents; - int rows = idx.model()->rowCount(idx); + const QAbstractItemModel *model = idx.model(); + const int rows = model->rowCount(idx); for (int i = 0 ; i < rows; ++i) { - QModelIndex child = idx.child(i, 0); + const QModelIndex child = model->index(i, 0, idx); Match m = child.data(MergeDialog::MergeReasonRole).value(); QString name = m.indexB.data(Qt::DisplayRole).toString(); @@ -111,9 +112,10 @@ const int separation = 5; - int facesRows = qMin(index.model()->rowCount(index), MAX_MATCHING_CONTACTS_ICON); + const QAbstractItemModel *model = index.model(); + int facesRows = qMin(model->rowCount(index), MAX_MATCHING_CONTACTS_ICON); for (int i = 0; i < facesRows; i++) { // Children Icon Displaying Loop - const QModelIndex child = index.child(i, 0); + const QModelIndex child = model->index(i, 0, index); QVariant decoration = child.data(Qt::DecorationRole); Q_ASSERT(decoration.type() == (QVariant::Icon));