Merge remote-tracking branch 'origin/wip/qt6' into wip/cmake

Change-Id: I3a1d7673c3c20019ab12a2ea0a60f1619920a34c

7 files changed, 19 insertions, 22 deletions

diff --git a/tests/auto/other/lancelot/paintcommands.cpp b/tests/auto/other/lancelot/paintcommands.cpp
index dc71253f3e..032580e0f6 100644
--- a/tests/auto/other/lancelot/paintcommands.cpp
+++ b/tests/auto/other/lancelot/paintcommands.cpp
@@ -2478,12 +2478,6 @@ void PaintCommands::command_surface_begin(QRegularExpressionMatch re)
         m_painter->fillRect(QRect(0, 0, qRound(w), qRound(h)), Qt::transparent);
         m_painter->restore();
 #endif
-#if 0 // Used to be included in Qt4 for Q_WS_X11
-    } else if (m_type == WidgetType) {
-        m_surface_pixmap = QPixmap(qRound(w), qRound(h));
-        m_surface_pixmap.fill(Qt::transparent);
-        m_painter = new QPainter(&m_surface_pixmap);
-#endif
     } else {
         QImage::Format surface_format;
         if (QImage::toPixelFormat(m_format).alphaUsage() != QPixelFormat::UsesAlpha)
@@ -2535,11 +2529,6 @@ void PaintCommands::command_surface_end(QRegularExpressionMatch)
         m_painter->beginNativePainting();
         m_painter->endNativePainting();
 #endif
-#if 0 // Used to be included in Qt4 for Q_WS_X11
-    } else if (m_type == WidgetType) {
-        m_painter->drawPixmap(m_surface_rect.topLeft(), m_surface_pixmap);
-        m_surface_pixmap = QPixmap();
-#endif
     } else {
         m_painter->drawImage(m_surface_rect, m_surface_image);
         m_surface_image = QImage();
diff --git a/tests/auto/other/lancelot/tst_lancelot.cpp b/tests/auto/other/lancelot/tst_lancelot.cpp
index 15267d256e..ba04802a26 100644
--- a/tests/auto/other/lancelot/tst_lancelot.cpp
+++ b/tests/auto/other/lancelot/tst_lancelot.cpp
@@ -85,6 +85,8 @@ private slots:
     void testRasterARGB8565PM();
     void testRasterGrayscale8_data();
     void testRasterGrayscale8();
+    void testRasterRGBA64PM_data();
+    void testRasterRGBA64PM();
 
 #ifndef QT_NO_OPENGL
     void testOpenGL_data();
@@ -226,6 +228,17 @@ void tst_Lancelot::testRasterGrayscale8()
 }
 
 
+void tst_Lancelot::testRasterRGBA64PM_data()
+{
+    setupTestSuite();
+}
+
+void tst_Lancelot::testRasterRGBA64PM()
+{
+    runTestSuite(Raster, QImage::Format_RGBA64_Premultiplied);
+}
+
+
 #ifndef QT_NO_OPENGL
 bool tst_Lancelot::checkSystemGLSupport()
 {
diff --git a/tests/auto/other/networkselftest/BLACKLIST b/tests/auto/other/networkselftest/BLACKLIST
index 948081eb78..55ebad985d 100644
--- a/tests/auto/other/networkselftest/BLACKLIST
+++ b/tests/auto/other/networkselftest/BLACKLIST
@@ -1,6 +1,5 @@
 # QTBUG-27571
 [ftpProxyServer]
-windows-10 msvc-2017
-windows-10 msvc-2015
 windows-7sp1
+windows-10
 
diff --git a/tests/auto/other/qabstractitemmodelutils/dynamictreemodel.cpp b/tests/auto/other/qabstractitemmodelutils/dynamictreemodel.cpp
index c8698242d5..ecc95d30b6 100644
--- a/tests/auto/other/qabstractitemmodelutils/dynamictreemodel.cpp
+++ b/tests/auto/other/qabstractitemmodelutils/dynamictreemodel.cpp
@@ -228,7 +228,7 @@ void ModelMoveCommand::doCommand()
             if (srcParent == destParent)
                 d = m_destRow - (m_endRow - m_startRow + 1);
             else
-                d = m_destRow - (m_endRow - m_startRow) + 1;
+                d = m_destRow;
         }
 
         foreach (const qint64 id, l)
diff --git a/tests/auto/other/qfocusevent/BLACKLIST b/tests/auto/other/qfocusevent/BLACKLIST
deleted file mode 100644
index 5af8be91a0..0000000000
--- a/tests/auto/other/qfocusevent/BLACKLIST
+++ /dev/null
@@ -1,3 +0,0 @@
-[checkReason_ActiveWindow]
-winrt
-
diff --git a/tests/auto/other/qnetworkaccessmanager_and_qprogressdialog/BLACKLIST b/tests/auto/other/qnetworkaccessmanager_and_qprogressdialog/BLACKLIST
index 65a939cdcb..6173488c00 100644
--- a/tests/auto/other/qnetworkaccessmanager_and_qprogressdialog/BLACKLIST
+++ b/tests/auto/other/qnetworkaccessmanager_and_qprogressdialog/BLACKLIST
@@ -1,5 +1,4 @@
 [downloadCheck]
-windows-10 msvc-2015
-windows-10 msvc-2017
+windows-10
 [downloadCheck:with-zeroCopy]
 windows
diff --git a/tests/auto/other/toolsupport/tst_toolsupport.cpp b/tests/auto/other/toolsupport/tst_toolsupport.cpp
index 8c129adaf3..ab7bca8322 100644
--- a/tests/auto/other/toolsupport/tst_toolsupport.cpp
+++ b/tests/auto/other/toolsupport/tst_toolsupport.cpp
@@ -135,11 +135,11 @@ void tst_toolsupport::offsets_data()
 
     {
         QTest::newRow("QDateTimePrivate::m_msecs")
-            << pmm_to_offsetof(&QDateTimePrivate::m_msecs) << 0 << 0;
+            << pmm_to_offsetof(&QDateTimePrivate::m_msecs) << 8 << 8;
         QTest::newRow("QDateTimePrivate::m_status")
-            << pmm_to_offsetof(&QDateTimePrivate::m_status) << 8 << 8;
+            << pmm_to_offsetof(&QDateTimePrivate::m_status) << 4 << 4;
         QTest::newRow("QDateTimePrivate::m_offsetFromUtc")
-            << pmm_to_offsetof(&QDateTimePrivate::m_offsetFromUtc) << 12 << 12;
+            << pmm_to_offsetof(&QDateTimePrivate::m_offsetFromUtc) << 16 << 16;
         QTest::newRow("QDateTimePrivate::m_timeZone")
             << pmm_to_offsetof(&QDateTimePrivate::m_timeZone) << 20 << 24;
     }