diff options
| author | Sergio Ahumada <sergio.ahumada@digia.com> | 2013-09-13 18:04:17 +0200 |
|---|---|---|
| committer | Sergio Ahumada <sergio.ahumada@digia.com> | 2013-09-13 18:04:17 +0200 |
| commit | f7837e28b5f83d116fa43d0401b7188ce27fc346 (patch) | |
| tree | 3de2560e4259f22224f334be17618386860decc7 /src/gui/text | |
| parent | 8b0624182bd4998d32c23eded5dbe6dccfd26d5b (diff) | |
| parent | 44a58de2aea6d2ac71efe7261a398effbf139f3f (diff) | |
Merge branch 'stable' into dev
Conflicts:
src/concurrent/qtconcurrentmedian.h
src/corelib/itemmodels/qabstractitemmodel.cpp
Change-Id: Iac46a90bbb2958cef7670031a4b59c3becd8538a
Diffstat (limited to 'src/gui/text')
| -rw-r--r-- | src/gui/text/qdistancefield_p.h | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/src/gui/text/qdistancefield_p.h b/src/gui/text/qdistancefield_p.h index d4c4f8f46d..5c8f5e5808 100644 --- a/src/gui/text/qdistancefield_p.h +++ b/src/gui/text/qdistancefield_p.h @@ -137,12 +137,6 @@ private: friend class QDistanceFieldData; }; - -inline QImage Q_GUI_EXPORT qt_renderDistanceFieldGlyph(const QRawFont &f, glyph_t g, bool d) -{ return QDistanceField(f, g, d).toImage(QImage::Format_Indexed8); } -inline QImage Q_GUI_EXPORT qt_renderDistanceFieldGlyph(QFontEngine *fe, glyph_t g, bool d) -{ return QDistanceField(fe, g, d).toImage(QImage::Format_Indexed8); } - QT_END_NAMESPACE #endif // QDISTANCEFIELD_H |