diff options
author | Water-Team <water@pad.test.qt.nokia.com> | 2011-08-02 23:00:12 (GMT) |
---|---|---|
committer | Water-Team <water@pad.test.qt.nokia.com> | 2011-08-02 23:00:12 (GMT) |
commit | 20152b600a6f2d2aa942b813e54f4734057399e3 (patch) | |
tree | 3c49e79b9fbcf90b306ce3777c125dfcf69f7627 | |
parent | d8090b0fab2fa61c91bbfe42769be4c01bab97a5 (diff) | |
parent | c27acdff7f5a2e5c13c90f51a443aeaca359c74e (diff) | |
download | Qt-20152b600a6f2d2aa942b813e54f4734057399e3.zip Qt-20152b600a6f2d2aa942b813e54f4734057399e3.tar.gz Qt-20152b600a6f2d2aa942b813e54f4734057399e3.tar.bz2 |
Merge branch '4.8-upstream' into master-water
-rw-r--r-- | src/gui/widgets/qlabel.cpp | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/src/gui/widgets/qlabel.cpp b/src/gui/widgets/qlabel.cpp index dcf35aa..ab88f38 100644 --- a/src/gui/widgets/qlabel.cpp +++ b/src/gui/widgets/qlabel.cpp @@ -92,6 +92,13 @@ QT_BEGIN_NAMESPACE by clear(). \endtable + \warning When passing a QString to the constructor or calling setText(), + make sure to sanitize your input, as QLabel tries to guess whether it + displays the text as plain text or as rich text. You may want to call + setTextFormat() explicitly, e.g. in case you expect the text to be in + plain format but cannot control the text source (for instance when + displaying data loaded from the Web). + When the content is changed using any of these functions, any previous content is cleared. |