summaryrefslogtreecommitdiffstats
path: root/src/corelib/kernel/qcoreapplication.cpp
diff options
context:
space:
mode:
authorLars Knoll <lars.knoll@nokia.com>2012-08-16 15:00:31 +0200
committerQt by Nokia <qt-info@nokia.com>2012-08-20 10:22:25 +0200
commitb4adefd572a9d5d1fd94fc3450e5fb4f6e83303b (patch)
treea4c38427cd397138e8fd2c233d7dd2c536bd9a09 /src/corelib/kernel/qcoreapplication.cpp
parent2fe35bf9a0f4d3cd5434026e1a01933444031212 (diff)
Fix a couple of qdoc errors.
Change-Id: I0770fc61e265face4fa061be9e110814effee181 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'src/corelib/kernel/qcoreapplication.cpp')
-rw-r--r--src/corelib/kernel/qcoreapplication.cpp10
1 files changed, 8 insertions, 2 deletions
diff --git a/src/corelib/kernel/qcoreapplication.cpp b/src/corelib/kernel/qcoreapplication.cpp
index 8d071e0ba2..d57ed54014 100644
--- a/src/corelib/kernel/qcoreapplication.cpp
+++ b/src/corelib/kernel/qcoreapplication.cpp
@@ -1466,8 +1466,9 @@ bool QCoreApplication::event(QEvent *e)
used in all cases.
\value UnicodeUTF8 UTF-8.
- \value Latin1 UTF-8.
- \value DefaultCodec UTF-8.
+ \omitvalue Latin1
+ \omitvalue DefaultCodec UTF-8.
+ \omitvalue CodecForTr
\sa QObject::tr(), QString::fromUtf8()
*/
@@ -1683,6 +1684,11 @@ QString QCoreApplication::translate(const char *context, const char *sourceText,
return result;
}
+/*! \fn static QString QCoreApplication::translate(const char * context, const char * key, const char * disambiguation, Encoding, int n = -1)
+
+ \obsolete
+*/
+
// Declared in qglobal.h
QString qtTrId(const char *id, int n)
{