Fix a couple of qdoc errors.

Change-Id: I0770fc61e265face4fa061be9e110814effee181
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>

diff --git a/src/corelib/io/qstandardpaths.cpp b/src/corelib/io/qstandardpaths.cpp
index 48664b5..59eaa04 100644 (file)
--- 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 8d071e0..d57ed54 100644 (file)
--- 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)
 {