diff options
| author | Andreas Aardal Hanssen <andreas.aardal.hanssen@nokia.com> | 2009-06-10 12:06:56 (GMT) |
|---|---|---|
| committer | Andreas Aardal Hanssen <andreas.aardal.hanssen@nokia.com> | 2009-06-10 12:06:56 (GMT) |
| commit | ef0a51654783f942499cfa9fca60d18c2fa6a702 (patch) | |
| tree | 1fd8158f883562a3ef000b0a4d26df5b1f064dae /src/gui/text/qfontengine_p.h | |
| parent | 53632d45ca64ad4c20d4302e0826c0234877dd69 (diff) | |
| parent | 62725a02652cee576efe055d1371765945045026 (diff) | |
| download | Qt-ef0a51654783f942499cfa9fca60d18c2fa6a702.zip Qt-ef0a51654783f942499cfa9fca60d18c2fa6a702.tar.gz Qt-ef0a51654783f942499cfa9fca60d18c2fa6a702.tar.bz2 | |
Merge commit 'qt-mainline/master' into master-recursivepaint
Diffstat (limited to 'src/gui/text/qfontengine_p.h')
| -rw-r--r-- | src/gui/text/qfontengine_p.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/src/gui/text/qfontengine_p.h b/src/gui/text/qfontengine_p.h index 0f8d81c..3ef9d5f 100644 --- a/src/gui/text/qfontengine_p.h +++ b/src/gui/text/qfontengine_p.h @@ -93,7 +93,6 @@ struct QGlyphLayout; class Q_GUI_EXPORT QFontEngine : public QObject { - Q_OBJECT public: enum Type { Box, |