summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSérgio Martins <sergio.martins@kdab.com>2016-04-19 13:33:46 +0100
committerSérgio Martins <iamsergio@gmail.com>2016-04-28 23:05:58 +0000
commit89d1c7c179aea55bd991b524bdcc9c3e265510fa (patch)
treefe079caae946fd9772c636ae44ea3a6840db59f7
parent31915a1805d61c512fad57585315a895d4543e51 (diff)
Make it clear that QObject::tr() falls back to QString::fromUtf8()
The reference to trUtf8() made it even more confusing, so remove it. It's redundant and deprecated anyway. Change-Id: I9921297160db3660bb5099692bbfdaf6e85637aa Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
-rw-r--r--src/corelib/kernel/qobject.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/corelib/kernel/qobject.cpp b/src/corelib/kernel/qobject.cpp
index 5afdd6a4e5..19df24744a 100644
--- a/src/corelib/kernel/qobject.cpp
+++ b/src/corelib/kernel/qobject.cpp
@@ -2144,8 +2144,8 @@ void QObject::deleteLater()
Returns a translated version of \a sourceText, optionally based on a
\a disambiguation string and value of \a n for strings containing plurals;
- otherwise returns \a sourceText itself if no appropriate translated string
- is available.
+ otherwise returns QString::fromUtf8(\a sourceText) if no appropriate
+ translated string is available.
Example:
\snippet ../widgets/mainwindows/sdi/mainwindow.cpp implicit tr context
@@ -2171,7 +2171,7 @@ void QObject::deleteLater()
translators while performing translations is not supported. Doing
so will probably result in crashes or other undesirable behavior.
- \sa trUtf8(), QCoreApplication::translate(), {Internationalization with Qt}
+ \sa QCoreApplication::translate(), {Internationalization with Qt}
*/
/*!