5 files changed, 11 insertions, 3 deletions
diff --git a/src/gui/painting/qpaintbuffer.cpp b/src/gui/painting/qpaintbuffer.cpp
index e41ad57..b0a3d7a 100644
--- a/src/gui/painting/qpaintbuffer.cpp
+++ b/src/gui/painting/qpaintbuffer.cpp
@@ -46,6 +46,7 @@
 #include <private/qemulationpaintengine_p.h>
 #include <private/qimage_p.h>
 #include <private/qstatictext_p.h>
+#include <private/qstatictext_p_p.h>
 
 #include <QDebug>
 
diff --git a/src/gui/painting/qpaintengine_raster.cpp b/src/gui/painting/qpaintengine_raster.cpp
index 1fbfbb4..29694d1 100644
--- a/src/gui/painting/qpaintengine_raster.cpp
+++ b/src/gui/painting/qpaintengine_raster.cpp
@@ -67,7 +67,7 @@
 //   #include <private/qpolygonclipper_p.h>
 //   #include <private/qrasterizer_p.h>
 #include <private/qimage_p.h>
-#include <private/qstatictext_p.h>
+#include <private/qstatictext_p_p.h>
 
 #include "qpaintengine_raster_p.h"
 //   #include "qbezier_p.h"
diff --git a/src/gui/painting/qpaintengineex.cpp b/src/gui/painting/qpaintengineex.cpp
index 1bbdafa..b61821d 100644
--- a/src/gui/painting/qpaintengineex.cpp
+++ b/src/gui/painting/qpaintengineex.cpp
@@ -44,7 +44,7 @@
 #include "qstroker_p.h"
 #include "qbezier_p.h"
 #include <private/qpainterpath_p.h>
-#include <private/qstatictext_p.h>
+#include <private/qstatictext_p_p.h>
 
 #include <qvarlengtharray.h>
 #include <qdebug.h>
diff --git a/src/gui/painting/qpainter.cpp b/src/gui/painting/qpainter.cpp
index 521072f..c29cf5d 100644
--- a/src/gui/painting/qpainter.cpp
+++ b/src/gui/painting/qpainter.cpp
@@ -70,6 +70,7 @@
 #include <private/qpaintengine_raster_p.h>
 #include <private/qmath_p.h>
 #include <private/qstatictext_p.h>
+#include <private/qstatictext_p_p.h>
 
 QT_BEGIN_NAMESPACE
 
@@ -5707,18 +5708,24 @@ void QPainter::drawText(const QPointF &p, const QString &str)
 /*!    
     \fn void QPainter::drawStaticText(const QPoint &position, const QStaticText &staticText)
 
+    \internal
+
     \overload
 */
 
 /*!    
     \fn void QPainter::drawStaticText(int x, int y, const QStaticText &staticText)
 
+    \internal
+
     \overload
 */
 
 /*!
     Draws the given \a staticText beginning at the given \a position. 
 
+    \internal
+
     This function can be used to optimize drawing text if the text and its layout is updated     
     seldomly.
 
diff --git a/src/gui/painting/qpainter.h b/src/gui/painting/qpainter.h
index 1ae7c08..181eba7 100644
--- a/src/gui/painting/qpainter.h
+++ b/src/gui/painting/qpainter.h
@@ -50,7 +50,6 @@
 #include <QtGui/qimage.h>
 #include <QtGui/qtextoption.h>
 #include <QtGui/qdrawutil.h>
-#include <QtGui/qstatictext.h>
 
 #ifndef QT_INCLUDE_COMPAT
 #include <QtGui/qpolygon.h>
@@ -79,6 +78,7 @@ class QPolygon;
 class QTextItem;
 class QMatrix;
 class QTransform;
+class QStaticText;
 
 class QPainterPrivateDeleter;