Remove an unnecessary None definition
We should be able to just pass `0L` and avoid defining a None macro. Pick-to: 6.5 Change-Id: I513d726120454523627a1e66515a5a533c0238b1 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
This commit is contained in:
parent
07a736db6a
commit
eec5a016d3
@ -16,10 +16,6 @@
|
|||||||
#include <X11/Xlib.h>
|
#include <X11/Xlib.h>
|
||||||
#undef register
|
#undef register
|
||||||
|
|
||||||
#ifndef None
|
|
||||||
#define None 0L
|
|
||||||
#endif
|
|
||||||
|
|
||||||
QT_BEGIN_NAMESPACE
|
QT_BEGIN_NAMESPACE
|
||||||
|
|
||||||
QXcbNativeBackingStore::QXcbNativeBackingStore(QWindow *window)
|
QXcbNativeBackingStore::QXcbNativeBackingStore(QWindow *window)
|
||||||
@ -78,11 +74,8 @@ void QXcbNativeBackingStore::flush(QWindow *window, const QRegion ®ion, const
|
|||||||
|
|
||||||
XRenderSetPictureClipRectangles(display(), dstPic, 0, 0, clipRects.constData(), clipRects.size());
|
XRenderSetPictureClipRectangles(display(), dstPic, 0, 0, clipRects.constData(), clipRects.size());
|
||||||
|
|
||||||
XRenderComposite(display(), PictOpSrc, srcPic, None, dstPic,
|
XRenderComposite(display(), PictOpSrc, srcPic, 0L /*None*/, dstPic, br.x() + offset.x(),
|
||||||
br.x() + offset.x(), br.y() + offset.y(),
|
br.y() + offset.y(), 0, 0, br.x(), br.y(), br.width(), br.height());
|
||||||
0, 0,
|
|
||||||
br.x(), br.y(),
|
|
||||||
br.width(), br.height());
|
|
||||||
|
|
||||||
XRenderFreePicture(display(), dstPic);
|
XRenderFreePicture(display(), dstPic);
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user