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 <[email protected]> Reviewed-by: Qt CI Bot <[email protected]>
ClassAteam · Apr 25, 2023 · eec5a01 · eec5a01
1 parent 07a736d
commit eec5a01
Showing 1 changed file with 2 additions and 9 deletions.
diff --git a/src/plugins/platforms/xcb/nativepainting/qbackingstore_x11.cpp b/src/plugins/platforms/xcb/nativepainting/qbackingstore_x11.cpp
@@ -16,10 +16,6 @@
 #include <X11/Xlib.h>
 #undef register
 
-#ifndef None
-#define None 0L
-#endif
-
 QT_BEGIN_NAMESPACE
 
 QXcbNativeBackingStore::QXcbNativeBackingStore(QWindow *window)
@@ -78,11 +74,8 @@ void QXcbNativeBackingStore::flush(QWindow *window, const QRegion &region, const
 
         XRenderSetPictureClipRectangles(display(), dstPic, 0, 0, clipRects.constData(), clipRects.size());
 
-        XRenderComposite(display(), PictOpSrc, srcPic, None, dstPic,
-                         br.x() + offset.x(), br.y() + offset.y(),
-                         0, 0,
-                         br.x(), br.y(),
-                         br.width(), br.height());
+        XRenderComposite(display(), PictOpSrc, srcPic, 0L /*None*/, dstPic, br.x() + offset.x(),
+                         br.y() + offset.y(), 0, 0, br.x(), br.y(), br.width(), br.height());
 
         XRenderFreePicture(display(), dstPic);
     }