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

 Conflicts:
	src/corelib/serialization/qcborvalue.cpp

Change-Id: I675a3029955c96e81a33ed9d98b72b55b6784b52

2 files changed, 50 insertions, 2 deletions

diff --git a/tests/auto/widgets/itemviews/qtreeview/tst_qtreeview.cpp b/tests/auto/widgets/itemviews/qtreeview/tst_qtreeview.cpp
index 23e2ec8516..8396fd4ec7 100644
--- a/tests/auto/widgets/itemviews/qtreeview/tst_qtreeview.cpp
+++ b/tests/auto/widgets/itemviews/qtreeview/tst_qtreeview.cpp
@@ -4922,13 +4922,27 @@ void tst_QTreeView::taskQTBUG_61476()
     const QPoint pos = rect.center();
 
     QTest::mousePress(tv.viewport(), Qt::LeftButton, {}, pos);
-    if (tv.style()->styleHint(QStyle::SH_ListViewExpand_SelectMouseType, nullptr, &tv) ==
-        QEvent::MouseButtonPress)
+    const bool expandsOnPress =
+        (tv.style()->styleHint(QStyle::SH_ListViewExpand_SelectMouseType, nullptr, &tv) == QEvent::MouseButtonPress);
+    if (expandsOnPress)
         QTRY_VERIFY(!tv.isExpanded(mi));
 
     QTest::mouseRelease(tv.viewport(), Qt::LeftButton, {}, pos);
     QTRY_VERIFY(!tv.isExpanded(mi));
     QCOMPARE(lastTopLevel->checkState(), Qt::Checked);
+
+    // Test that it does not toggle the check state of a previously selected item when collapsing an
+    // item causes it to position the item under the mouse to be the decoration for the selected item
+    tv.expandAll();
+    tv.verticalScrollBar()->setValue(tv.verticalScrollBar()->maximum());
+    // It is not enough to programmatically select the item, we need to have it clicked on
+    QTest::mouseClick(tv.viewport(), Qt::LeftButton, {}, tv.visualRect(lastTopLevel->index()).center());
+    QTest::mousePress(tv.viewport(), Qt::LeftButton, {}, pos);
+    if (expandsOnPress)
+        QTRY_VERIFY(!tv.isExpanded(mi));
+    QTest::mouseRelease(tv.viewport(), Qt::LeftButton, nullptr, pos);
+    QTRY_VERIFY(!tv.isExpanded(mi));
+    QCOMPARE(lastTopLevel->checkState(), Qt::Checked);
 }
 
 QTEST_MAIN(tst_QTreeView)
diff --git a/tests/auto/widgets/kernel/qwidget/tst_qwidget.cpp b/tests/auto/widgets/kernel/qwidget/tst_qwidget.cpp
index 07f84595fd..6f8fd5dcbe 100644
--- a/tests/auto/widgets/kernel/qwidget/tst_qwidget.cpp
+++ b/tests/auto/widgets/kernel/qwidget/tst_qwidget.cpp
@@ -53,6 +53,7 @@
 #include <qmainwindow.h>
 #include <qdockwidget.h>
 #include <qrandom.h>
+#include <qstylehints.h>
 #include <qtoolbar.h>
 #include <qtoolbutton.h>
 #include <QtCore/qoperatingsystemversion.h>
@@ -198,6 +199,7 @@ private slots:
     void hideWhenFocusWidgetIsChild();
     void normalGeometry();
     void setGeometry();
+    void setGeometryHidden();
     void windowOpacity();
     void raise();
     void lower();
@@ -2946,6 +2948,38 @@ void tst_QWidget::setGeometry()
     QCOMPARE(tlw.geometry(), tr);
 }
 
+void tst_QWidget::setGeometryHidden()
+{
+    if (QGuiApplication::styleHints()->showIsMaximized())
+        QSKIP("Platform does not support QWidget::setGeometry() - skipping");
+
+    QWidget tlw;
+    tlw.setWindowTitle(QLatin1String(QTest::currentTestFunction()));
+    QWidget child(&tlw);
+
+    const QRect tr(m_availableTopLeft + QPoint(100, 100), 2 * m_testWidgetSize);
+    const QRect cr(QPoint(50, 50), m_testWidgetSize);
+    tlw.setGeometry(tr);
+    child.setGeometry(cr);
+    tlw.showNormal();
+
+    tlw.hide();
+    QTRY_VERIFY(tlw.isHidden());
+    tlw.setGeometry(cr);
+    QVERIFY(tlw.testAttribute(Qt::WA_PendingMoveEvent));
+    QVERIFY(tlw.testAttribute(Qt::WA_PendingResizeEvent));
+    QImage img(tlw.size(), QImage::Format_ARGB32);  // just needed to call QWidget::render()
+    tlw.render(&img);
+    QVERIFY(!tlw.testAttribute(Qt::WA_PendingMoveEvent));
+    QVERIFY(!tlw.testAttribute(Qt::WA_PendingResizeEvent));
+    tlw.setGeometry(cr);
+    QVERIFY(!tlw.testAttribute(Qt::WA_PendingMoveEvent));
+    QVERIFY(!tlw.testAttribute(Qt::WA_PendingResizeEvent));
+    tlw.resize(cr.size());
+    QVERIFY(!tlw.testAttribute(Qt::WA_PendingMoveEvent));
+    QVERIFY(!tlw.testAttribute(Qt::WA_PendingResizeEvent));
+}
+
 void tst_QWidget::windowOpacity()
 {
     QWidget widget;