Temporarily remove QPainter::drawStaticText() for Qt 4.6.x integration

We can't add new symbols to QPainter for Qt 4.6.x, as we would not be
able to remove them again if we regretted the API. Hence, I've made
removable symbols instead, a private global function and a
drawStaticText() in QPainterPrivate. In order to tie things together,
I needed a static private-getter in QPainterPrivate, and hence it
had to be a friend of QPainter.

Reviewed-by: Trond

1 files changed, 1 insertions, 15 deletions

diff --git a/src/gui/painting/qpainter.h b/src/gui/painting/qpainter.h
index 181eba7..088a973 100644
--- a/src/gui/painting/qpainter.h
+++ b/src/gui/painting/qpainter.h
@@ -78,7 +78,6 @@ class QPolygon;
 class QTextItem;
 class QMatrix;
 class QTransform;
-class QStaticText;
 
 class QPainterPrivateDeleter;
 
@@ -370,10 +369,6 @@ public:
     void setLayoutDirection(Qt::LayoutDirection direction);
     Qt::LayoutDirection layoutDirection() const;
 
-    inline void drawStaticText(int x, int y, const QStaticText &staticText);
-    inline void drawStaticText(const QPoint &p, const QStaticText &staticText);
-    void drawStaticText(const QPointF &p, const QStaticText &staticText);
-
     void drawText(const QPointF &p, const QString &s);
     inline void drawText(const QPoint &p, const QString &s);
     inline void drawText(int x, int y, const QString &s);
@@ -527,6 +522,7 @@ private:
     friend class QRasterPaintEngine;
     friend class QAlphaPaintEngine;
     friend class QPreviewPaintEngine;
+    friend class QPainterPrivate;
 };
 
 Q_DECLARE_OPERATORS_FOR_FLAGS(QPainter::RenderHints)
@@ -911,16 +907,6 @@ inline void QPainter::drawText(const QPoint &p, const QString &s)
     drawText(QPointF(p), s);
 }
 
-inline void QPainter::drawStaticText(const QPoint &p, const QStaticText &staticText)
-{
-    drawStaticText(QPointF(p), staticText);
-}
-
-inline void QPainter::drawStaticText(int x, int y, const QStaticText &staticText)
-{
-    drawStaticText(QPointF(x, y), staticText);
-}
-
 inline void QPainter::drawText(int x, int y, int w, int h, int flags, const QString &str, QRect *br)
 {
     drawText(QRect(x, y, w, h), flags, str, br);