summaryrefslogtreecommitdiffstats
path: root/src/gui/widgets
diff options
context:
space:
mode:
authorHonglei Zhang <honglei.zhang@nokia.com>2011-08-04 07:47:56 (GMT)
committerHonglei Zhang <honglei.zhang@nokia.com>2011-08-04 07:47:56 (GMT)
commit41c038dadb505d82447e1d9a8a743e0614c60098 (patch)
treec05e11632c8898db7d2e443f6cb09fda75592c14 /src/gui/widgets
parent8e2dc4ac2ec35e9b2f57ade5af390c2d44765382 (diff)
parent920ce5ed71bc456e429b887801a8d8bea7a3db0d (diff)
downloadQt-41c038dadb505d82447e1d9a8a743e0614c60098.zip
Qt-41c038dadb505d82447e1d9a8a743e0614c60098.tar.gz
Qt-41c038dadb505d82447e1d9a8a743e0614c60098.tar.bz2
Merge remote-tracking branch 'qt/4.8'
Diffstat (limited to 'src/gui/widgets')
-rw-r--r--src/gui/widgets/qlabel.cpp7
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.