diff options
| author | Bea Lam <bea.lam@nokia.com> | 2010-02-25 23:35:43 (GMT) |
|---|---|---|
| committer | Bea Lam <bea.lam@nokia.com> | 2010-02-25 23:35:43 (GMT) |
| commit | 31c8459d65aaca9131a8aa32e29e0591ed7892cb (patch) | |
| tree | 5339f4b4291c17a9a765a70990ec3c12f4055de7 /src/gui/text/qfont.h | |
| parent | 5c82031a7357f4f3d100be30c0bfe4e878712829 (diff) | |
| parent | 61811d9b43828c1cc53c773fd66b78313f4fb942 (diff) | |
| download | Qt-31c8459d65aaca9131a8aa32e29e0591ed7892cb.zip Qt-31c8459d65aaca9131a8aa32e29e0591ed7892cb.tar.gz Qt-31c8459d65aaca9131a8aa32e29e0591ed7892cb.tar.bz2 | |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml
Conflicts:
src/declarative/qml/qdeclarativeproperty.cpp
Diffstat (limited to 'src/gui/text/qfont.h')
| -rw-r--r-- | src/gui/text/qfont.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/gui/text/qfont.h b/src/gui/text/qfont.h index a2fff70..5adf237 100644 --- a/src/gui/text/qfont.h +++ b/src/gui/text/qfont.h @@ -291,6 +291,7 @@ private: friend class QFontMetricsF; friend class QFontInfo; friend class QPainter; + friend class QPainterPrivate; friend class QPSPrintEngineFont; friend class QApplication; friend class QWidget; |