diff options
| author | Tasuku Suzuki <tasuku.suzuki@nokia.com> | 2010-03-18 14:00:09 (GMT) |
|---|---|---|
| committer | Zeno Albisser <zeno.albisser@nokia.com> | 2010-03-26 13:46:08 (GMT) |
| commit | 5de7a8578cf5ac563d8b17b2e1eadde06e469d8e (patch) | |
| tree | 4d3086988dc02db1c1f783aef1722192abbe2e2c /src/gui/text | |
| parent | c7d39e1335775979d43833d0b7f6c32cef898424 (diff) | |
| download | Qt-5de7a8578cf5ac563d8b17b2e1eadde06e469d8e.zip Qt-5de7a8578cf5ac563d8b17b2e1eadde06e469d8e.tar.gz Qt-5de7a8578cf5ac563d8b17b2e1eadde06e469d8e.tar.bz2 | |
Fix compile error with QT_NO_TEXTHTMLPARSER in QtGui
Merge-request: 528
Reviewed-by: Zeno Albisser
Diffstat (limited to 'src/gui/text')
| -rw-r--r-- | src/gui/text/qstatictext.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/gui/text/qstatictext.cpp b/src/gui/text/qstatictext.cpp index 1fabf12..798ae37 100644 --- a/src/gui/text/qstatictext.cpp +++ b/src/gui/text/qstatictext.cpp @@ -553,8 +553,11 @@ void QStaticTextPrivate::paintText(const QPointF &pos, QPainter *p) } else { QTextDocument document; document.setDefaultFont(font); +#ifndef QT_NO_TEXTHTMLPARSER document.setHtml(text); - +#else + document.setPlainText(text); +#endif QRectF rect = maximumSize.isValid() ? QRectF(pos, maximumSize) : QRectF(); document.adjustSize(); p->save(); |