diff options
| author | Olivier Goffart <ogoffart@trolltech.com> | 2009-11-27 15:57:23 (GMT) |
|---|---|---|
| committer | Olivier Goffart <ogoffart@trolltech.com> | 2009-11-27 15:58:43 (GMT) |
| commit | f93097671f512f38790ba2d56bd5b1e037810266 (patch) | |
| tree | a4dd9aa09a8ca658bb9a46da26472ee0c5f317da /src/gui/text | |
| parent | 19d0a365dd99dc1a108e58949f7d0f49bac72623 (diff) | |
| parent | 583b1529894aca5e9ffa353f0547dfb4b8b0ab21 (diff) | |
| download | Qt-f93097671f512f38790ba2d56bd5b1e037810266.zip Qt-f93097671f512f38790ba2d56bd5b1e037810266.tar.gz Qt-f93097671f512f38790ba2d56bd5b1e037810266.tar.bz2 | |
Merge commit oslo-staging-2/4.6 into upstream/4.6
Diffstat (limited to 'src/gui/text')
| -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; |