diff options
| author | Yann Bodson <yann.bodson@nokia.com> | 2011-02-07 07:23:42 (GMT) |
|---|---|---|
| committer | Yann Bodson <yann.bodson@nokia.com> | 2011-02-09 00:20:47 (GMT) |
| commit | ccd1b7dd5c8e6b1c4bf5b21354f7b9acaf881b00 (patch) | |
| tree | 70fff5170c32335a78e9b4fb3856cdf60b78f5cd /src/declarative/graphicsitems/qdeclarativetext_p.h | |
| parent | f7e789710568d263816f50bd5782cc7adec41249 (diff) | |
| download | Qt-ccd1b7dd5c8e6b1c4bf5b21354f7b9acaf881b00.zip Qt-ccd1b7dd5c8e6b1c4bf5b21354f7b9acaf881b00.tar.gz Qt-ccd1b7dd5c8e6b1c4bf5b21354f7b9acaf881b00.tar.bz2 | |
Use same values for Text.lineHeightMode and QTextBlock::lineHeightMode from master.
- MultiplyHeight becomes ProportionalHeight
- PixelHeight becomes FixedHeight
Change-Id: I2a1ebc6ff9db7e62f513919f19773f985b08f8d7
Reviewed-by: Michael Brasser
Diffstat (limited to 'src/declarative/graphicsitems/qdeclarativetext_p.h')
| -rw-r--r-- | src/declarative/graphicsitems/qdeclarativetext_p.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/declarative/graphicsitems/qdeclarativetext_p.h b/src/declarative/graphicsitems/qdeclarativetext_p.h index f3697d5..b8835d1 100644 --- a/src/declarative/graphicsitems/qdeclarativetext_p.h +++ b/src/declarative/graphicsitems/qdeclarativetext_p.h @@ -114,7 +114,7 @@ public: Wrap = QTextOption::WrapAtWordBoundaryOrAnywhere }; - enum LineHeightMode { MultiplyHeight, PixelHeight }; + enum LineHeightMode { ProportionalHeight, FixedHeight }; QString text() const; void setText(const QString &); |