diff options
author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-08-02 15:18:06 (GMT) |
---|---|---|
committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-08-02 15:18:06 (GMT) |
commit | c27acdff7f5a2e5c13c90f51a443aeaca359c74e (patch) | |
tree | 3c49e79b9fbcf90b306ce3777c125dfcf69f7627 /src | |
parent | 021908ba7c6a6052d497ccbd09871894d54c644d (diff) | |
parent | 31f7ecbdcdbafbac5bbfa693e4d060757244941b (diff) | |
download | Qt-c27acdff7f5a2e5c13c90f51a443aeaca359c74e.zip Qt-c27acdff7f5a2e5c13c90f51a443aeaca359c74e.tar.gz Qt-c27acdff7f5a2e5c13c90f51a443aeaca359c74e.tar.bz2 |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging:
QLabel documentation: add warning about sanitizing input
Diffstat (limited to 'src')
-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. |