diff options
author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-10-11 16:12:21 +0200 |
---|---|---|
committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-10-11 16:12:35 +0200 |
commit | d0eb444a49f6064ecb896f62276e060cd8a4b1e8 (patch) | |
tree | 34d8dd637baf665225ada73e76604531cd2c75e5 /src/corelib/global/qnamespace.qdoc | |
parent | da0cb32b8ee7cc4a991a59420a411898e63a660e (diff) | |
parent | 894f86709080fe8d20875b402adce679963c49c2 (diff) |
Merge remote-tracking branch 'origin/stable' into dev
Change-Id: Ib8cfeee7d9ca15e8ad520e428b72c200827a8628
Diffstat (limited to 'src/corelib/global/qnamespace.qdoc')
-rw-r--r-- | src/corelib/global/qnamespace.qdoc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/corelib/global/qnamespace.qdoc b/src/corelib/global/qnamespace.qdoc index 63afd707c1..78f6a60287 100644 --- a/src/corelib/global/qnamespace.qdoc +++ b/src/corelib/global/qnamespace.qdoc @@ -2234,7 +2234,7 @@ of rich text. \value AutoText The text string is interpreted as for - Qt::RichText if Qt::mightBeRichText() returns true, otherwise + Qt::RichText if Qt::mightBeRichText() returns \c true, otherwise as Qt::PlainText. */ |