diff options
| author | Gabriel de Dietrich <gabriel.dietrich-de@nokia.com> | 2011-02-08 10:57:34 (GMT) |
|---|---|---|
| committer | Gabriel de Dietrich <gabriel.dietrich-de@nokia.com> | 2011-02-08 10:57:34 (GMT) |
| commit | eb7958c65b09569c2531d2c443a6d0fe0b507d97 (patch) | |
| tree | 91544e4a4cf5c65b3acec7c219ebe63176a14994 /src/declarative/graphicsitems/qdeclarativetextedit_p_p.h | |
| parent | ef998bca70a799806c5754edfa49ea625881bc3e (diff) | |
| parent | 44298c848ac254fe1942eb32eed7651dec5bf0e3 (diff) | |
| download | Qt-eb7958c65b09569c2531d2c443a6d0fe0b507d97.zip Qt-eb7958c65b09569c2531d2c443a6d0fe0b507d97.tar.gz Qt-eb7958c65b09569c2531d2c443a6d0fe0b507d97.tar.bz2 | |
Merge branch 'master-upstream'
Diffstat (limited to 'src/declarative/graphicsitems/qdeclarativetextedit_p_p.h')
| -rw-r--r-- | src/declarative/graphicsitems/qdeclarativetextedit_p_p.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/declarative/graphicsitems/qdeclarativetextedit_p_p.h b/src/declarative/graphicsitems/qdeclarativetextedit_p_p.h index 68a9cc8..3a45541 100644 --- a/src/declarative/graphicsitems/qdeclarativetextedit_p_p.h +++ b/src/declarative/graphicsitems/qdeclarativetextedit_p_p.h @@ -92,6 +92,7 @@ public: QString text; QFont font; + QFont sourceFont; QColor color; QColor selectionColor; QColor selectedTextColor; |