diff options
author | Alexandru Croitor <alexandru.croitor@qt.io> | 2019-09-04 14:33:40 +0200 |
---|---|---|
committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2019-09-16 09:41:23 +0200 |
commit | 93f2f33a49f6c96a4f94f344edf03164ed944d02 (patch) | |
tree | 9a799be282e6c0d6544d9f8c872073f83e6c0475 /tests/auto/other/lancelot/paintcommands.cpp | |
parent | 7e8705f6632428a8d9a937ab5fe087999347b3dd (diff) | |
parent | f255b1e8e297e7e1363921580007145cff574e0d (diff) |
Merge "Merge remote-tracking branch 'origin/dev' into wip/qt6"
Diffstat (limited to 'tests/auto/other/lancelot/paintcommands.cpp')
-rw-r--r-- | tests/auto/other/lancelot/paintcommands.cpp | 11 |
1 files changed, 0 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(); |