diff options
Diffstat (limited to 'src/gui/text/qfont.h')
-rw-r--r-- | src/gui/text/qfont.h | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/src/gui/text/qfont.h b/src/gui/text/qfont.h index 14f290ceb3..421c1dd2de 100644 --- a/src/gui/text/qfont.h +++ b/src/gui/text/qfont.h @@ -287,14 +287,6 @@ public: inline uint resolve() const { return resolve_mask; } inline void resolve(uint mask) { resolve_mask = mask; } -#ifdef QT3_SUPPORT - static QT3_SUPPORT QFont defaultFont(); - static QT3_SUPPORT void setDefaultFont(const QFont &); - QT3_SUPPORT void setPixelSizeFloat(qreal); - QT3_SUPPORT qreal pointSizeFloat() const { return pointSizeF(); } - QT3_SUPPORT void setPointSizeFloat(qreal size) { setPointSizeF(size); } -#endif - private: QFont(QFontPrivate *); @@ -324,7 +316,7 @@ private: friend class QStackTextEngine; friend class QTextLine; friend struct QScriptLine; - friend class QGLContext; + friend class QOpenGLContext; friend class QWin32PaintEngine; friend class QAlphaPaintEngine; friend class QPainterPath; |