From 22a6540326ad5c97babde53ea70f291e38e65f2d Mon Sep 17 00:00:00 2001
From: Lars Knoll <lars.knoll@nokia.com>
Date: Thu, 5 May 2011 09:55:00 +0200
Subject: [PATCH] QPixmapFilter will live in QtWidgets

The class is only used for QGraphicsEffect. When merging
QtOpenGL into Gui and Widgets, the GL nased pixmap
filters will also need to be moved into effects/ and
the pixmapFilter() method in QPaintEngineEx can get
removed.
---
 src/gui/effects/effects.pri                  | 6 ++++--
 src/gui/{image => effects}/qpixmapfilter.cpp | 0
 src/gui/{image => effects}/qpixmapfilter_p.h | 0
 src/gui/image/image.pri                      | 2 --
 src/gui/painting/qpaintengineex_p.h          | 1 +
 5 files changed, 5 insertions(+), 4 deletions(-)
 rename src/gui/{image => effects}/qpixmapfilter.cpp (100%)
 rename src/gui/{image => effects}/qpixmapfilter_p.h (100%)

diff --git a/src/gui/effects/effects.pri b/src/gui/effects/effects.pri
index 0ebf96fccb..a21f941866 100644
--- a/src/gui/effects/effects.pri
+++ b/src/gui/effects/effects.pri
@@ -1,4 +1,6 @@
 HEADERS += effects/qgraphicseffect.h \
-    effects/qgraphicseffect_p.h
+    effects/qgraphicseffect_p.h \
+        effects/qpixmapfilter_p.h
 
-SOURCES += effects/qgraphicseffect.cpp
+SOURCES += effects/qgraphicseffect.cpp \
+        effects/qpixmapfilter.cpp
diff --git a/src/gui/image/qpixmapfilter.cpp b/src/gui/effects/qpixmapfilter.cpp
similarity index 100%
rename from src/gui/image/qpixmapfilter.cpp
rename to src/gui/effects/qpixmapfilter.cpp
diff --git a/src/gui/image/qpixmapfilter_p.h b/src/gui/effects/qpixmapfilter_p.h
similarity index 100%
rename from src/gui/image/qpixmapfilter_p.h
rename to src/gui/effects/qpixmapfilter_p.h
diff --git a/src/gui/image/image.pri b/src/gui/image/image.pri
index f9e0fa449a..25da543b08 100644
--- a/src/gui/image/image.pri
+++ b/src/gui/image/image.pri
@@ -23,7 +23,6 @@ HEADERS += \
         image/qpixmapcache_p.h \
         image/qpixmapdata_p.h \
         image/qpixmapdatafactory_p.h \
-        image/qpixmapfilter_p.h \
         image/qimagepixmapcleanuphooks_p.h \
         image/qvolatileimage_p.h \
         image/qvolatileimagedata_p.h \
@@ -42,7 +41,6 @@ SOURCES += \
         image/qpixmapcache.cpp \
         image/qpixmapdata.cpp \
         image/qpixmapdatafactory.cpp \
-        image/qpixmapfilter.cpp \
         image/qmovie.cpp \
         image/qpixmap_raster.cpp \
         image/qpixmap_blitter.cpp \
diff --git a/src/gui/painting/qpaintengineex_p.h b/src/gui/painting/qpaintengineex_p.h
index d5bef1ef17..da469936fc 100644
--- a/src/gui/painting/qpaintengineex_p.h
+++ b/src/gui/painting/qpaintengineex_p.h
@@ -212,6 +212,7 @@ public:
     virtual void beginNativePainting() {}
     virtual void endNativePainting() {}
 
+    // ### Qt5: remove, once QtOpenGL is merged into QtGui and QtWidgets
     // Return a pixmap filter of "type" that can render the parameters
     // in "prototype".  The returned filter is owned by the engine and
     // will be destroyed when the engine is destroyed.  The "prototype"