From 444ddca247cacc5376821e82588b1d8b76133437 Mon Sep 17 00:00:00 2001
From: Martin Smith <msmith@trolltech.com>
Date: Mon, 31 Aug 2009 15:10:32 +0200
Subject: doc: Fixed several qdoc errors.

---
 src/corelib/io/qprocess.cpp                   | 5 +++++
 src/corelib/io/qprocess_symbian.cpp           | 2 --
 src/corelib/io/qprocess_unix.cpp              | 2 --
 src/gui/kernel/qwidget.cpp                    | 2 +-
 src/opengl/qglshaderprogram.cpp               | 2 +-
 src/script/bridge/qscriptactivationobject.cpp | 4 ++--
 src/testlib/qtestcase.cpp                     | 4 ++++
 7 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/src/corelib/io/qprocess.cpp b/src/corelib/io/qprocess.cpp
index f7049d3..5b6830c 100644
--- a/src/corelib/io/qprocess.cpp
+++ b/src/corelib/io/qprocess.cpp
@@ -411,6 +411,11 @@ void QProcessPrivate::Channel::clear()
     process = 0;
 }
 
+/*! \fn bool QProcessPrivate::startDetached(const QString &program, const QStringList &arguments, const QString &workingDirectory, qint64 *pid)
+  
+\internal
+ */
+
 /*!
     \class QProcess
 
diff --git a/src/corelib/io/qprocess_symbian.cpp b/src/corelib/io/qprocess_symbian.cpp
index e558387..d41321b 100644
--- a/src/corelib/io/qprocess_symbian.cpp
+++ b/src/corelib/io/qprocess_symbian.cpp
@@ -1009,8 +1009,6 @@ void QProcessPrivate::_q_notified()
     // Nothing to do in Symbian
 }
 
-/*! \internal
- */
 bool QProcessPrivate::startDetached(const QString &program, const QStringList &arguments, const QString &workingDirectory, qint64 *pid)
 {
     QPROCESS_DEBUG_PRINT("QProcessPrivate::startDetached()");
diff --git a/src/corelib/io/qprocess_unix.cpp b/src/corelib/io/qprocess_unix.cpp
index baf90c4..d45ff03 100644
--- a/src/corelib/io/qprocess_unix.cpp
+++ b/src/corelib/io/qprocess_unix.cpp
@@ -1163,8 +1163,6 @@ void QProcessPrivate::_q_notified()
 {
 }
 
-/*! \internal
- */
 bool QProcessPrivate::startDetached(const QString &program, const QStringList &arguments, const QString &workingDirectory, qint64 *pid)
 {
     processManager()->start();
diff --git a/src/gui/kernel/qwidget.cpp b/src/gui/kernel/qwidget.cpp
index ab809df..ff644b8 100644
--- a/src/gui/kernel/qwidget.cpp
+++ b/src/gui/kernel/qwidget.cpp
@@ -919,7 +919,7 @@ void QWidget::setAutoFillBackground(bool enabled)
     any amount of widgets there might be physical restrictions to amount of
     softkeys that can be used by the device.
 
-    \o Series60: For series60 menu button is automatically mapped to left
+    \e Series60: For series60 menu button is automatically mapped to left
     soft key if there is QMainWindow with QMenuBar in widgets parent hierarchy.
 
     \sa softKeys()
diff --git a/src/opengl/qglshaderprogram.cpp b/src/opengl/qglshaderprogram.cpp
index c9bfd08..6e8474c 100644
--- a/src/opengl/qglshaderprogram.cpp
+++ b/src/opengl/qglshaderprogram.cpp
@@ -194,7 +194,7 @@ QT_BEGIN_NAMESPACE
 */
 
 /*!
-    \enum QGLShader::ShaderType
+    \enum QGLShader::ShaderTypeBits
     This enum specifies the type of QGLShader that is being created.
 
     \value VertexShader Vertex shader written in the OpenGL Shading Language (GLSL).
diff --git a/src/script/bridge/qscriptactivationobject.cpp b/src/script/bridge/qscriptactivationobject.cpp
index c6d405e..1c7b912 100644
--- a/src/script/bridge/qscriptactivationobject.cpp
+++ b/src/script/bridge/qscriptactivationobject.cpp
@@ -52,8 +52,8 @@ namespace JSC
 QT_BEGIN_NAMESPACE
 
 /*!
-\class QScriptActivationObject
-\internal
+  \class QScript::QScriptActivationObject
+  \internal
 
   Represent a scope for native function call.
 */
diff --git a/src/testlib/qtestcase.cpp b/src/testlib/qtestcase.cpp
index c655cad..b9636c9 100644
--- a/src/testlib/qtestcase.cpp
+++ b/src/testlib/qtestcase.cpp
@@ -2121,6 +2121,10 @@ bool QTest::compare_string_helper(const char *t1, const char *t2, const char *ac
     \internal
 */
 
+/*! \fn bool QTest::qCompare(bool const &t1, int const &t2, const char *actual, const char *expected, const char *file, int line)
+  \internal
+ */
+  
 /*! \fn bool QTest::qTest(const T& actual, const char *elementName, const char *actualStr, const char *expected, const char *file, int line)
     \internal
 */
-- 
cgit v0.12