2 files changed, 13 insertions, 11 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()
 {