diff options
| author | Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com> | 2009-11-27 08:37:37 (GMT) |
|---|---|---|
| committer | Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com> | 2009-11-27 08:37:37 (GMT) |
| commit | f50cfa3a5a6b8408276e540a52f4232568c871fa (patch) | |
| tree | 8061e5f6aa5a28a32b875f553f392921eb6f0d81 | |
| parent | e8d7d2172627dd3cac8b0cc3165ed371b524feb4 (diff) | |
| download | Qt-f50cfa3a5a6b8408276e540a52f4232568c871fa.zip Qt-f50cfa3a5a6b8408276e540a52f4232568c871fa.tar.gz Qt-f50cfa3a5a6b8408276e540a52f4232568c871fa.tar.bz2 | |
Fix compilation on Windows CE
Commit 6ef5b4485b9fe5a9d25d2d9b5e67f110fb728a8b broke compilation on
Windows CE by moving code out from a #ifndef Q_WS_WINCE block.
Reviewed-by: Rohan McGovern
| -rw-r--r-- | src/gui/text/qfontengine_win.cpp | 2 | ||||
| -rw-r--r-- | src/gui/text/qfontengine_win_p.h | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/src/gui/text/qfontengine_win.cpp b/src/gui/text/qfontengine_win.cpp index 18851b7..7ec8e31 100644 --- a/src/gui/text/qfontengine_win.cpp +++ b/src/gui/text/qfontengine_win.cpp @@ -485,6 +485,7 @@ glyph_metrics_t QFontEngineWin::boundingBox(const QGlyphLayout &glyphs) return glyph_metrics_t(0, -tm.tmAscent, w, tm.tmHeight, w, 0); } +#ifndef Q_WS_WINCE bool QFontEngineWin::getOutlineMetrics(glyph_t glyph, const QTransform &t, glyph_metrics_t *metrics) const { Q_ASSERT(metrics != 0); @@ -536,6 +537,7 @@ bool QFontEngineWin::getOutlineMetrics(glyph_t glyph, const QTransform &t, glyph return false; } } +#endif glyph_metrics_t QFontEngineWin::boundingBox(glyph_t glyph, const QTransform &t) { diff --git a/src/gui/text/qfontengine_win_p.h b/src/gui/text/qfontengine_win_p.h index 43e1f12..bab71c9 100644 --- a/src/gui/text/qfontengine_win_p.h +++ b/src/gui/text/qfontengine_win_p.h @@ -109,7 +109,9 @@ public: int getGlyphIndexes(const QChar *ch, int numChars, QGlyphLayout *glyphs, bool mirrored) const; void getCMap(); +#ifndef Q_WS_WINCE bool getOutlineMetrics(glyph_t glyph, const QTransform &t, glyph_metrics_t *metrics) const; +#endif QString _name; HFONT hfont; |