diff options
| author | Harald Fernengel <harald@trolltech.com> | 2009-08-03 13:12:46 (GMT) |
|---|---|---|
| committer | Harald Fernengel <harald@trolltech.com> | 2009-08-03 13:12:46 (GMT) |
| commit | 41a83e1ff19ad1396e6001e6b0ac003c701ba55a (patch) | |
| tree | 609e40eda10418bbf925002c36552074796b96b6 /src/gui/text/qfontengine_ft_p.h | |
| parent | d1f3b9df2bc5c57d414da73a7d4f9ed7b25df3db (diff) | |
| download | Qt-41a83e1ff19ad1396e6001e6b0ac003c701ba55a.zip Qt-41a83e1ff19ad1396e6001e6b0ac003c701ba55a.tar.gz Qt-41a83e1ff19ad1396e6001e6b0ac003c701ba55a.tar.bz2 | |
Squashed commit of the topic/exceptions branch.
Contains some smaller fixes and renaming of macros. Looks big,
but isn't scary at all ;)
Diffstat (limited to 'src/gui/text/qfontengine_ft_p.h')
| -rw-r--r-- | src/gui/text/qfontengine_ft_p.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/text/qfontengine_ft_p.h b/src/gui/text/qfontengine_ft_p.h index aa1cd0a..0572e92 100644 --- a/src/gui/text/qfontengine_ft_p.h +++ b/src/gui/text/qfontengine_ft_p.h @@ -119,7 +119,7 @@ struct QFreetypeFace static void addBitmapToPath(FT_GlyphSlot slot, const QFixedPoint &point, QPainterPath *path, bool = false); private: - friend class QScopedPointer<QFreetypeFace>; + friend class QScopedPointerDeleter<QFreetypeFace>; QFreetypeFace() : _lock(QMutex::Recursive) {} ~QFreetypeFace() {} QAtomicInt ref; |