From b4adefd572a9d5d1fd94fc3450e5fb4f6e83303b Mon Sep 17 00:00:00 2001 From: Lars Knoll Date: Thu, 16 Aug 2012 15:00:31 +0200 Subject: [PATCH] Fix a couple of qdoc errors. Change-Id: I0770fc61e265face4fa061be9e110814effee181 Reviewed-by: Thiago Macieira --- src/corelib/io/qstandardpaths.cpp | 3 ++- src/corelib/kernel/qcoreapplication.cpp | 10 ++++++++-- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/src/corelib/io/qstandardpaths.cpp b/src/corelib/io/qstandardpaths.cpp index 48664b5012..59eaa04894 100644 --- a/src/corelib/io/qstandardpaths.cpp +++ b/src/corelib/io/qstandardpaths.cpp @@ -315,7 +315,8 @@ QString QStandardPaths::displayName(StandardLocation type) /*! \fn void QStandardPaths::enableTestMode(bool testMode) - Enables "test mode" in QStandardPaths, which changes writable locations + If \a testMode is true, this enables a special "test mode" in + QStandardPaths, which changes writable locations to point to test directories, in order to prevent auto tests from reading from or writing to the current user's configuration. 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) {