diff options
| author | Kent Hansen <kent.hansen@nokia.com> | 2012-03-27 16:19:29 +0200 |
|---|---|---|
| committer | Kent Hansen <kent.hansen@nokia.com> | 2012-03-27 19:22:48 +0200 |
| commit | d236fe2214340164bec4f34cb27dea4a634ee0de (patch) | |
| tree | cda4ebbcc91717b37e5a2dbccb9ee46c2a1d3885 /src/platformsupport/fontdatabases/mac/qfontengine_coretext_p.h | |
| parent | 2b17b0235b70f89d15d3b91a14c3297d38377f94 (diff) | |
| parent | cbc883da6910b3357a4e03d0e2dfa841da1a03e8 (diff) | |
Merge master into api_changes
Conflicts:
src/corelib/global/qisenum.h
src/dbus/qdbusconnection_p.h
src/widgets/kernel/qwidget.cpp
tests/auto/other/qaccessibility/tst_qaccessibility.cpp
Change-Id: I85102515d5fec835832cc20ffdc5c1ba578bd01d
Diffstat (limited to 'src/platformsupport/fontdatabases/mac/qfontengine_coretext_p.h')
| -rw-r--r-- | src/platformsupport/fontdatabases/mac/qfontengine_coretext_p.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/platformsupport/fontdatabases/mac/qfontengine_coretext_p.h b/src/platformsupport/fontdatabases/mac/qfontengine_coretext_p.h index 02c8d926fd..3d286c8625 100644 --- a/src/platformsupport/fontdatabases/mac/qfontengine_coretext_p.h +++ b/src/platformsupport/fontdatabases/mac/qfontengine_coretext_p.h @@ -98,7 +98,7 @@ public: virtual QFixed emSquareSize() const; virtual QFontEngine *cloneWithSize(qreal pixelSize) const; - virtual int glyphMargin(QFontEngineGlyphCache::Type type) { return 0; } + virtual int glyphMargin(QFontEngineGlyphCache::Type type) { Q_UNUSED(type); return 0; } static int antialiasingThreshold; static QFontEngineGlyphCache::Type defaultGlyphFormat; |