Merge remote-tracking branch 'origin/5.15' into dev

 Conflicts:
	examples/network/bearermonitor/CMakeLists.txt
	examples/network/CMakeLists.txt
	src/corelib/tools/qlinkedlist.h
	src/sql/kernel/qsqldriver_p.h
	src/sql/kernel/qsqlresult_p.h
	src/widgets/kernel/qwidget.cpp
	src/widgets/kernel/qwidget_p.h
	tests/auto/network/socket/platformsocketengine/tst_platformsocketengine.cpp
	tests/auto/network/socket/qtcpsocket/tst_qtcpsocket.cpp
	tests/auto/tools/moc/allmocs_baseline_in.json

Change-Id: I21a3c34570ae79ea9d30107fae71759d7eac17d9

4 files changed, 10 insertions, 14 deletions

diff --git a/src/widgets/itemviews/qabstractitemview.cpp b/src/widgets/itemviews/qabstractitemview.cpp
index 2524d4acfa..ebef36d033 100644
--- a/src/widgets/itemviews/qabstractitemview.cpp
+++ b/src/widgets/itemviews/qabstractitemview.cpp
@@ -705,15 +705,6 @@ void QAbstractItemView::setModel(QAbstractItemModel *model)
     }
     d->model = (model ? model : QAbstractItemModelPrivate::staticEmptyModel());
 
-    // These asserts do basic sanity checking of the model
-    Q_ASSERT_X(d->model->index(0,0) == d->model->index(0,0),
-               "QAbstractItemView::setModel",
-               "A model should return the exact same index "
-               "(including its internal id/pointer) when asked for it twice in a row.");
-    Q_ASSERT_X(!d->model->index(0,0).parent().isValid(),
-               "QAbstractItemView::setModel",
-               "The parent of a top level index should be invalid");
-
     if (d->model != QAbstractItemModelPrivate::staticEmptyModel()) {
         connect(d->model, SIGNAL(destroyed()),
                 this, SLOT(_q_modelDestroyed()));
@@ -3244,8 +3235,10 @@ void QAbstractItemView::setIndexWidget(const QModelIndex &index, QWidget *widget
         widget->installEventFilter(this);
         widget->show();
         dataChanged(index, index); // update the geometry
-        if (!d->delayedPendingLayout)
+        if (!d->delayedPendingLayout) {
             widget->setGeometry(visualRect(index));
+            d->doDelayedItemsLayout();  // relayout due to updated geometry
+        }
     }
 }
 
diff --git a/src/widgets/itemviews/qitemdelegate.cpp b/src/widgets/itemviews/qitemdelegate.cpp
index 4420d39b8e..40ad48c655 100644
--- a/src/widgets/itemviews/qitemdelegate.cpp
+++ b/src/widgets/itemviews/qitemdelegate.cpp
@@ -1122,7 +1122,7 @@ QRect QItemDelegate::textRectangle(QPainter * /*painter*/, const QRect &rect,
     QSizeF fpSize = d->doTextLayout(rect.width());
     const QSize size = QSize(qCeil(fpSize.width()), qCeil(fpSize.height()));
     // ###: textRectangle should take style option as argument
-    const int textMargin = QApplication::style()->pixelMetric(QStyle::PM_FocusFrameHMargin) + 1;
+    const int textMargin = QApplication::style()->pixelMetric(QStyle::PM_FocusFrameHMargin, nullptr) + 1;
     return QRect(0, 0, size.width() + 2 * textMargin, size.height());
 }
 
diff --git a/src/widgets/itemviews/qlistview.cpp b/src/widgets/itemviews/qlistview.cpp
index ec01922746..4cb9214ff4 100644
--- a/src/widgets/itemviews/qlistview.cpp
+++ b/src/widgets/itemviews/qlistview.cpp
@@ -1728,8 +1728,11 @@ void QListViewPrivate::prepareItemsLayout()
     layoutBounds = QRect(QPoint(), q->maximumViewportSize());
 
     int frameAroundContents = 0;
-    if (q->style()->styleHint(QStyle::SH_ScrollView_FrameOnlyAroundContents))
-        frameAroundContents = q->style()->pixelMetric(QStyle::PM_DefaultFrameWidth) * 2;
+    if (q->style()->styleHint(QStyle::SH_ScrollView_FrameOnlyAroundContents)) {
+        QStyleOption option;
+        option.initFrom(q);
+        frameAroundContents = q->style()->pixelMetric(QStyle::PM_DefaultFrameWidth, &option) * 2;
+    }
 
     // maximumViewportSize() already takes scrollbar into account if policy is
     // Qt::ScrollBarAlwaysOn but scrollbar extent must be deduced if policy
diff --git a/src/widgets/itemviews/qtablewidget.cpp b/src/widgets/itemviews/qtablewidget.cpp
index 60abd02564..7b1f1a1caf 100644
--- a/src/widgets/itemviews/qtablewidget.cpp
+++ b/src/widgets/itemviews/qtablewidget.cpp
@@ -247,8 +247,8 @@ void QTableModel::removeItem(QTableWidgetItem *item)
 {
     int i = tableItems.indexOf(item);
     if (i != -1) {
-        tableItems[i] = 0;
         QModelIndex idx = index(item);
+        tableItems[i] = nullptr;
         emit dataChanged(idx, idx);
         return;
     }