From 1314ffac189224ad2b1c2b6939a73463576bf716 Mon Sep 17 00:00:00 2001 From: Ivailo Monev Date: Fri, 31 Jul 2020 17:01:29 -0400 Subject: [PATCH] remove code for always false condition in QRasterWindowSurface Signed-off-by: Ivailo Monev --- src/gui/painting/qwindowsurface_raster.cpp | 25 ------------------------- src/gui/painting/qwindowsurface_raster_p.h | 3 --- 2 files changed, 28 deletions(-) diff --git a/src/gui/painting/qwindowsurface_raster.cpp b/src/gui/painting/qwindowsurface_raster.cpp index a4426e3f1..4b171b039 100644 --- a/src/gui/painting/qwindowsurface_raster.cpp +++ b/src/gui/painting/qwindowsurface_raster.cpp @@ -55,9 +55,6 @@ public: #ifdef Q_WS_X11 GC gc; -#ifndef QT_NO_XSHM - bool needsSync; -#endif #ifndef QT_NO_XRENDER bool translucentBackground; #endif @@ -74,9 +71,6 @@ QRasterWindowSurface::QRasterWindowSurface(QWidget *window, bool setDefaultSurfa d_ptr->translucentBackground = qt_x11Data->use_xrender && window->x11Info().depth() == 32; #endif -#ifndef QT_NO_XSHM - d_ptr->needsSync = false; -#endif #endif d_ptr->image = 0; d_ptr->inSetGeometry = false; @@ -97,23 +91,8 @@ QPaintDevice *QRasterWindowSurface::paintDevice() return d_ptr->image; } -#if defined(Q_WS_X11) && !defined(QT_NO_XSHM) -void QRasterWindowSurface::syncX() -{ - // delay writing to the backbuffer until we know for sure X is done reading from it - if (d_ptr->needsSync) { - XSync(qt_x11Data->display, false); - d_ptr->needsSync = false; - } -} -#endif - void QRasterWindowSurface::beginPaint(const QRegion &rgn) { -#if defined(Q_WS_X11) && !defined(QT_NO_XSHM) - syncX(); -#endif - #if defined(Q_WS_X11) && !defined(QT_NO_XRENDER) if (!qt_widget_private(window())->isOpaque && window()->testAttribute(Qt::WA_TranslucentBackground)) { QPainter p(d_ptr->image); @@ -209,10 +188,6 @@ bool QRasterWindowSurface::scroll(const QRegion &area, int dx, int dy) if (!d->image || d->image->isNull()) return false; -#if defined(Q_WS_X11) && !defined(QT_NO_XSHM) - syncX(); -#endif - qt_scrollRectInImage(d->image, area.boundingRect(), QPoint(dx, dy)); return true; diff --git a/src/gui/painting/qwindowsurface_raster_p.h b/src/gui/painting/qwindowsurface_raster_p.h index 21811c402..6dd94f634 100644 --- a/src/gui/painting/qwindowsurface_raster_p.h +++ b/src/gui/painting/qwindowsurface_raster_p.h @@ -71,9 +71,6 @@ public: WindowSurfaceFeatures features() const; private: -#if defined(Q_WS_X11) && !defined(QT_NO_XSHM) - void syncX(); -#endif void prepareBuffer(QImage::Format format); Q_DECLARE_PRIVATE(QRasterWindowSurface) QScopedPointer d_ptr; -- 2.11.0