diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-03-31 03:14:14 +0200 |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-03-31 03:14:14 +0200 |
| commit | 622a27c582f859274a5b9e40c625a6fda600b7b1 (patch) | |
| tree | 6f52745b6eeb479fe1d5e23ebc205661508960e3 /src/gui/text/qfontengine_win.cpp | |
| parent | 4dd2bbe5da43fe26bbe75edd27e02eefae6b82d4 (diff) | |
| parent | 880e4935410769b8337d75f219bef70493c4bb2c (diff) | |
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Revert "Add a children private property needed for QML to support QGraphicsObject"
Revert "struct -> class, it's better."
Revert "Add NOTIFY to size property so QML bindings are working fine."
Revert "Better handling for NOTIFY in QGraphicsWidget regarding geometry changes"
Revert "Add a a layout property in QGraphicsWidget."
Add a workaround for a bug in Mac filesystem watcher.
Another "off by 1" problem in OpenVG - in paths this time.
Doc: Added links and notes to modules, ActiveQt and XMLPatterns docs.
Compile on MingW
struct -> class, it's better.
Add a a layout property in QGraphicsWidget.
Fix QFileSystemModel to not install useless watchers on the filesystem
Diffstat (limited to 'src/gui/text/qfontengine_win.cpp')
| -rw-r--r-- | src/gui/text/qfontengine_win.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/gui/text/qfontengine_win.cpp b/src/gui/text/qfontengine_win.cpp index d126a2e0ad..eea196eb4c 100644 --- a/src/gui/text/qfontengine_win.cpp +++ b/src/gui/text/qfontengine_win.cpp @@ -654,6 +654,7 @@ static const ushort char_table[] = { static const int char_table_entries = sizeof(char_table)/sizeof(ushort); +#ifndef Q_CC_MINGW void QFontEngineWin::getGlyphBearings(glyph_t glyph, qreal *leftBearing, qreal *rightBearing) { HDC hdc = shared_dc(); @@ -678,6 +679,7 @@ void QFontEngineWin::getGlyphBearings(glyph_t glyph, qreal *leftBearing, qreal * } #endif } +#endif // Q_CC_MINGW qreal QFontEngineWin::minLeftBearing() const { |