summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlessandro Portale <aportale@trolltech.com>2009-08-21 21:41:21 (GMT)
committerAlessandro Portale <aportale@trolltech.com>2009-08-21 21:41:21 (GMT)
commit7b65d08062526e14855e6023eebf5f88f075cda7 (patch)
treecb96ce64b0089d519a00da8867fadd28b6e46dcb
parentbab60c1b5c2bf8a32eb8e2be2470e28559c4b24a (diff)
parent6eff22a59538940f3c6b633cf6bb959734a3d73f (diff)
downloadQt-7b65d08062526e14855e6023eebf5f88f075cda7.zip
Qt-7b65d08062526e14855e6023eebf5f88f075cda7.tar.gz
Qt-7b65d08062526e14855e6023eebf5f88f075cda7.tar.bz2
Merge branch 'master' of git@scm.dev.troll.no:qt/qt
-rw-r--r--src/gui/painting/qpaintengine_raster_p.h1
-rw-r--r--src/gui/painting/qrasterizer_p.h2
2 files changed, 2 insertions, 1 deletions
diff --git a/src/gui/painting/qpaintengine_raster_p.h b/src/gui/painting/qpaintengine_raster_p.h
index 4353dd9..4d3f5be 100644
--- a/src/gui/painting/qpaintengine_raster_p.h
+++ b/src/gui/painting/qpaintengine_raster_p.h
@@ -62,6 +62,7 @@
#include "private/qstroker_p.h"
#include "private/qpainter_p.h"
#include "private/qtextureglyphcache_p.h"
+#include "private/qoutlinemapper_p.h"
#include <stdlib.h>
diff --git a/src/gui/painting/qrasterizer_p.h b/src/gui/painting/qrasterizer_p.h
index 487c029..d3d60f1 100644
--- a/src/gui/painting/qrasterizer_p.h
+++ b/src/gui/painting/qrasterizer_p.h
@@ -65,7 +65,7 @@ struct QSpanData;
class QRasterBuffer;
class QRasterizerPrivate;
-class QRasterizer
+class Q_GUI_EXPORT QRasterizer
{
public:
QRasterizer();