Move QPolygonClipper to XCB native painting

It is the only code using it.

Change-Id: I30060a63b6621ea94ae487ec93cd857117e12a46
Reviewed-by: Eirik Aavitsland <eirik.aavitsland@qt.io>

8 files changed, 5 insertions, 7 deletions

diff --git a/src/gui/CMakeLists.txt b/src/gui/CMakeLists.txt
index a7c0006bb9..5d7037079a 100644
--- a/src/gui/CMakeLists.txt
+++ b/src/gui/CMakeLists.txt
@@ -190,7 +190,6 @@ qt_internal_add_module(Gui
         painting/qpixellayout.cpp painting/qpixellayout_p.h
         painting/qplatformbackingstore.cpp painting/qplatformbackingstore.h
         painting/qpolygon.cpp painting/qpolygon.h
-        painting/qpolygonclipper_p.h
         painting/qrangecollection.cpp painting/qrangecollection.h painting/qrangecollection_p.h
         painting/qrasterdefs_p.h
         painting/qrasterizer.cpp painting/qrasterizer_p.h
diff --git a/src/gui/painting/painting.pri b/src/gui/painting/painting.pri
index 52729d8f09..ccd67e12b3 100644
--- a/src/gui/painting/painting.pri
+++ b/src/gui/painting/painting.pri
@@ -49,7 +49,6 @@ HEADERS += \
         painting/qpen.h \
         painting/qpixellayout_p.h \
         painting/qpolygon.h \
-        painting/qpolygonclipper_p.h \
         painting/qrangecollection.h \
         painting/qrangecollection_p.h \
         painting/qrasterdefs_p.h \
diff --git a/src/gui/painting/qpaintengine_raster.cpp b/src/gui/painting/qpaintengine_raster.cpp
index 781888dd5b..a82d8df8b5 100644
--- a/src/gui/painting/qpaintengine_raster.cpp
+++ b/src/gui/painting/qpaintengine_raster.cpp
@@ -57,7 +57,6 @@
 #include <private/qtextengine_p.h>
 #include <private/qfontengine_p.h>
 #include <private/qpixmap_raster_p.h>
-//   #include <private/qpolygonclipper_p.h>
 //   #include <private/qrasterizer_p.h>
 #include <private/qimage_p.h>
 #include <private/qstatictext_p.h>
diff --git a/src/plugins/platforms/xcb/CMakeLists.txt b/src/plugins/platforms/xcb/CMakeLists.txt
index 6d6b76a641..e4af25458e 100644
--- a/src/plugins/platforms/xcb/CMakeLists.txt
+++ b/src/plugins/platforms/xcb/CMakeLists.txt
@@ -120,6 +120,7 @@ qt_internal_extend_target(XcbQpa CONDITION QT_FEATURE_xcb_native_painting
         nativepainting/qcolormap_x11.cpp nativepainting/qcolormap_x11_p.h
         nativepainting/qpaintengine_x11.cpp nativepainting/qpaintengine_x11_p.h
         nativepainting/qpixmap_x11.cpp nativepainting/qpixmap_x11_p.h
+        nativepainting/polygonclipper_p.h
         nativepainting/qt_x11_p.h
         nativepainting/qtessellator.cpp nativepainting/qtessellator_p.h
         nativepainting/qxcbnativepainting.cpp nativepainting/qxcbnativepainting.h
diff --git a/src/plugins/platforms/xcb/nativepainting/nativepainting.pri b/src/plugins/platforms/xcb/nativepainting/nativepainting.pri
index 78ed00843f..e1a47fb7d7 100644
--- a/src/plugins/platforms/xcb/nativepainting/nativepainting.pri
+++ b/src/plugins/platforms/xcb/nativepainting/nativepainting.pri
@@ -7,6 +7,7 @@ qtConfig(xcb-native-painting) {
         $$PWD/qtessellator_p.h \
         $$PWD/qpixmap_x11_p.h \
         $$PWD/qpaintengine_x11_p.h \
+        $$PWD/qpolygonclipper_p.h \
         $$PWD/qt_x11_p.h \
         $$PWD/qcolormap_x11_p.h \
         $$PWD/qbackingstore_x11_p.h \
diff --git a/src/plugins/platforms/xcb/nativepainting/qpaintengine_x11.cpp b/src/plugins/platforms/xcb/nativepainting/qpaintengine_x11.cpp
index 82900d4054..e69030ca97 100644
--- a/src/plugins/platforms/xcb/nativepainting/qpaintengine_x11.cpp
+++ b/src/plugins/platforms/xcb/nativepainting/qpaintengine_x11.cpp
@@ -41,7 +41,6 @@
 
 #include <private/qpixmapcache_p.h>
 #include <private/qpaintengine_p.h>
-#include <private/qpolygonclipper_p.h>
 #include <private/qpainterpath_p.h>
 #include <private/qdrawhelper_p.h>
 #include <private/qfontengineglyphcache_p.h>
@@ -51,6 +50,7 @@
 #endif
 
 #include "qpaintengine_x11_p.h"
+#include "qpolygonclipper_p.h"
 #include "qtessellator_p.h"
 #include "qpixmap_x11_p.h"
 #include "qcolormap_x11_p.h"
diff --git a/src/gui/painting/qpolygonclipper_p.h b/src/plugins/platforms/xcb/nativepainting/qpolygonclipper_p.h
index 04a31111c9..33499df6ed 100644
--- a/src/gui/painting/qpolygonclipper_p.h
+++ b/src/plugins/platforms/xcb/nativepainting/qpolygonclipper_p.h
@@ -51,8 +51,8 @@
 // We mean it.
 //
 
-#include <QtGui/private/qtguiglobal_p.h>
-#include "private/qdatabuffer_p.h"
+#include <QtCore/qrect.h>
+#include <QtGui/private/qdatabuffer_p.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/printsupport/platform/macos/qpaintengine_mac_p.h b/src/printsupport/platform/macos/qpaintengine_mac_p.h
index 5ee158e8e5..c2e2f95318 100644
--- a/src/printsupport/platform/macos/qpaintengine_mac_p.h
+++ b/src/printsupport/platform/macos/qpaintengine_mac_p.h
@@ -55,7 +55,6 @@
 
 #include <QtGui/qpaintengine.h>
 #include <QtGui/private/qpaintengine_p.h>
-#include <QtGui/private/qpolygonclipper_p.h>
 #include <QtGui/private/qfont_p.h>
 #include <QtCore/qhash.h>