diff options
| author | Martin Jones <martin.jones@nokia.com> | 2010-04-08 03:04:13 (GMT) |
|---|---|---|
| committer | Martin Jones <martin.jones@nokia.com> | 2010-04-08 03:04:13 (GMT) |
| commit | 71f9283df3caabadcfb04e2ab6f57305cd73c0d1 (patch) | |
| tree | 99489117c607f5c7039d3dd8fb4d647121d23eab /src/declarative/graphicsitems/qdeclarativetext_p_p.h | |
| parent | e005c3048ee69be668a6b4903ce281500543d454 (diff) | |
| download | Qt-71f9283df3caabadcfb04e2ab6f57305cd73c0d1.zip Qt-71f9283df3caabadcfb04e2ab6f57305cd73c0d1.tar.gz Qt-71f9283df3caabadcfb04e2ab6f57305cd73c0d1.tar.bz2 | |
Replace Text::wrap property with Text::wrapMode enumeration.
wrap remains for a little while, and will produce a warning.
Diffstat (limited to 'src/declarative/graphicsitems/qdeclarativetext_p_p.h')
| -rw-r--r-- | src/declarative/graphicsitems/qdeclarativetext_p_p.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/declarative/graphicsitems/qdeclarativetext_p_p.h b/src/declarative/graphicsitems/qdeclarativetext_p_p.h index 85a65ce..cc5a9f2 100644 --- a/src/declarative/graphicsitems/qdeclarativetext_p_p.h +++ b/src/declarative/graphicsitems/qdeclarativetext_p_p.h @@ -72,8 +72,8 @@ public: QDeclarativeTextPrivate() : color((QRgb)0), style(QDeclarativeText::Normal), hAlign(QDeclarativeText::AlignLeft), vAlign(QDeclarativeText::AlignTop), elideMode(QDeclarativeText::ElideNone), - imgDirty(true), dirty(true), wrap(false), richText(false), singleline(false), cache(true), doc(0), - format(QDeclarativeText::AutoText) + imgDirty(true), dirty(true), richText(false), singleline(false), cache(true), doc(0), + format(QDeclarativeText::AutoText), wrapMode(QDeclarativeText::NoWrap) { #if defined(QML_NO_TEXT_CACHE) cache = false; @@ -115,7 +115,6 @@ public: QDeclarativeText::TextElideMode elideMode; bool imgDirty:1; bool dirty:1; - bool wrap:1; bool richText:1; bool singleline:1; bool cache:1; @@ -123,6 +122,7 @@ public: QTextLayout layout; QSize cachedLayoutSize; QDeclarativeText::TextFormat format; + QDeclarativeText::WrapMode wrapMode; }; QT_END_NAMESPACE |