summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJørgen Lind <jorgen.lind@nokia.com>2010-03-29 11:21:47 (GMT)
committerJørgen Lind <jorgen.lind@nokia.com>2010-03-29 11:21:47 (GMT)
commita31270b5fc88460d6923ac1f2b5b6e90da59c9c8 (patch)
tree015de93cc801c1a041acc1242a5d11115a66c500
parenta5e1442d8960d3a9f363a8101d02e6fae804b6f8 (diff)
downloadQt-a31270b5fc88460d6923ac1f2b5b6e90da59c9c8.zip
Qt-a31270b5fc88460d6923ac1f2b5b6e90da59c9c8.tar.gz
Qt-a31270b5fc88460d6923ac1f2b5b6e90da59c9c8.tar.bz2
Compile fix from merging blitter examples.
-rw-r--r--src/gui/painting/painting.pri2
-rw-r--r--src/plugins/graphicssystems/blittable/qblittable_image.h2
2 files changed, 1 insertions, 3 deletions
diff --git a/src/gui/painting/painting.pri b/src/gui/painting/painting.pri
index a3fe2e1..3273cb3 100644
--- a/src/gui/painting/painting.pri
+++ b/src/gui/painting/painting.pri
@@ -17,7 +17,6 @@ HEADERS += \
painting/qpaintengine_p.h \
painting/qpaintengine_alpha_p.h \
painting/qpaintengine_preview_p.h \
- painting/qpaintengine_blitter_p.h \
painting/qpaintengineex_p.h \
painting/qpainter.h \
painting/qpainter_p.h \
@@ -64,7 +63,6 @@ SOURCES += \
painting/qpaintengine.cpp \
painting/qpaintengine_alpha.cpp \
painting/qpaintengine_preview.cpp \
- painting/qpaintengine_blitter.cpp \
painting/qpaintengineex.cpp \
painting/qpainter.cpp \
painting/qpainterpath.cpp \
diff --git a/src/plugins/graphicssystems/blittable/qblittable_image.h b/src/plugins/graphicssystems/blittable/qblittable_image.h
index 8ca86b7..3f8dc69 100644
--- a/src/plugins/graphicssystems/blittable/qblittable_image.h
+++ b/src/plugins/graphicssystems/blittable/qblittable_image.h
@@ -1,6 +1,6 @@
#include <qimage.h>
-#include <private/qpaintengine_blitter_p.h>
+#include <private/qblittable_p.h>
class QImageBlittable : public QBlittable