diff options
| author | Friedemann Kleint <Friedemann.Kleint@nokia.com> | 2011-10-13 14:25:18 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2011-10-13 15:07:41 +0200 |
| commit | 1582407fc782c0befd0760633324dd5c206524a1 (patch) | |
| tree | e993d66e824da41ece006d44c48acd4df0ba749e /src/gui/text/qfontengine_ft_p.h | |
| parent | 30cb91e17d2fbbdce90f7542f44e12af971ba2de (diff) | |
Remove Q_WS_ and Q_OS_SYMBIAN from QtGui.
Change-Id: I2ac3376513c3fbfc81a2e695a73a0d948d2696bc
Reviewed-on: http://codereview.qt-project.org/6607
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
Diffstat (limited to 'src/gui/text/qfontengine_ft_p.h')
| -rw-r--r-- | src/gui/text/qfontengine_ft_p.h | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/src/gui/text/qfontengine_ft_p.h b/src/gui/text/qfontengine_ft_p.h index f22a043548..bbef0bfcc7 100644 --- a/src/gui/text/qfontengine_ft_p.h +++ b/src/gui/text/qfontengine_ft_p.h @@ -58,9 +58,6 @@ #include <ft2build.h> #include FT_FREETYPE_H -#if defined(Q_WS_X11) -#include <private/qt_x11_p.h> -#endif #ifndef Q_OS_WIN #include <unistd.h> @@ -165,9 +162,6 @@ public: Subpixel_VBGR }; -#if defined(Q_WS_X11) && !defined(QT_NO_XRENDER) - typedef XGlyphInfo GlyphInfo; -#else struct GlyphInfo { unsigned short width; unsigned short height; @@ -176,7 +170,6 @@ public: short xOff; short yOff; }; -#endif struct GlyphAndSubPixelPosition { @@ -310,9 +303,6 @@ private: const QFixedPoint *positions, GlyphFormat format = Format_Render); -#if defined(Q_WS_QWS) || defined(Q_OS_SYMBIAN) - virtual void draw(QPaintEngine * /*p*/, qreal /*x*/, qreal /*y*/, const QTextItemInt & /*si*/) {} -#endif QFontEngineFT(const QFontDef &fd); virtual ~QFontEngineFT(); |