summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorMartin Smith <msmith@trolltech.com>2009-08-31 13:10:32 (GMT)
committerMartin Smith <msmith@trolltech.com>2009-08-31 13:11:28 (GMT)
commit444ddca247cacc5376821e82588b1d8b76133437 (patch)
treea864bde3389c2681b7cec78d540d0333dcf3c9a3 /src
parent8b916347634f2dcbb7d3e7c26a72879bee711012 (diff)
downloadQt-444ddca247cacc5376821e82588b1d8b76133437.zip
Qt-444ddca247cacc5376821e82588b1d8b76133437.tar.gz
Qt-444ddca247cacc5376821e82588b1d8b76133437.tar.bz2
doc: Fixed several qdoc errors.
Diffstat (limited to 'src')
-rw-r--r--src/corelib/io/qprocess.cpp5
-rw-r--r--src/corelib/io/qprocess_symbian.cpp2
-rw-r--r--src/corelib/io/qprocess_unix.cpp2
-rw-r--r--src/gui/kernel/qwidget.cpp2
-rw-r--r--src/opengl/qglshaderprogram.cpp2
-rw-r--r--src/script/bridge/qscriptactivationobject.cpp4
-rw-r--r--src/testlib/qtestcase.cpp4
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
*/