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.cpp | |
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.cpp')
-rw-r--r-- | src/gui/text/qfontengine.cpp | 14 |
1 files changed, 0 insertions, 14 deletions
diff --git a/src/gui/text/qfontengine.cpp b/src/gui/text/qfontengine.cpp index 1960b1e9b2..3f008064e2 100644 --- a/src/gui/text/qfontengine.cpp +++ b/src/gui/text/qfontengine.cpp @@ -796,7 +796,6 @@ QFontEngineGlyphCache *QFontEngine::glyphCache(void *key, QFontEngineGlyphCache: return 0; } -#if defined(Q_WS_WIN) || defined(Q_WS_X11) || defined(Q_WS_QWS) || defined(Q_WS_QPA) || defined(Q_OS_SYMBIAN) static inline QFixed kerning(int left, int right, const QFontEngine::KernPair *pairs, int numPairs) { uint left_right = (left << 16) + right; @@ -895,11 +894,6 @@ end: // qDebug() << 'i' << i << "left_right" << hex << kerning_pairs.at(i).left_right; } -#else -void QFontEngine::doKerning(QGlyphLayout *, QTextEngine::ShaperFlags) const -{ -} -#endif int QFontEngine::glyphCount() const { @@ -1249,7 +1243,6 @@ glyph_metrics_t QFontEngineBox::boundingBox(const QGlyphLayout &glyphs) return overall; } -#if defined(Q_WS_QWS) || defined(Q_WS_QPA) void QFontEngineBox::draw(QPaintEngine *p, qreal x, qreal y, const QTextItemInt &ti) { if (!ti.glyphs.numGlyphs) @@ -1276,7 +1269,6 @@ void QFontEngineBox::draw(QPaintEngine *p, qreal x, qreal y, const QTextItemInt painter->drawRect(QRectF(positions[k].toPointF(), s)); painter->restore(); } -#endif glyph_metrics_t QFontEngineBox::boundingBox(glyph_t) { @@ -1310,12 +1302,6 @@ qreal QFontEngineBox::maxCharWidth() const return _size; } -#ifdef Q_WS_X11 -int QFontEngineBox::cmap() const -{ - return -1; -} -#endif const char *QFontEngineBox::name() const { |