doc: Fixed several qdoc warnings.

6 files changed, 34 insertions, 21 deletions

diff --git a/doc/src/classes/phonon-api.qdoc b/doc/src/classes/phonon-api.qdoc
index 641b936..6fe0223 100644
--- a/doc/src/classes/phonon-api.qdoc
+++ b/doc/src/classes/phonon-api.qdoc
@@ -1577,7 +1577,6 @@
     \since 4.4
     \brief The MediaObject class provides an interface for media playback.
 
-
     The media object manages a \l{Phonon::}{MediaSource}, which
     supplies the media object with multimedia content, e.g., from a
     file. A playback in Phonon is always started by calling the
@@ -1651,17 +1650,8 @@
     playback of the current source, but it is possible to try with a
     different one. A user readable error message is given by
     errorString().
-    \section1 Symbian Platform Security Requirements
-
-    On Symbian, processes which access media via the network must
-    have the \c NetworkServices platform security capability. If the client
-    process lacks this capability, operations will result in errors.
-    This failure is indicated by a state() of Phonon::ErrorState.
-
-    Platform security capabilities are added via the
-    \l{qmake-variable-reference.html#target-capability}{TARGET.CAPABILITY}
-    qmake variable.
 
+    \sa {Symbian Platform Security Requirements}
     \sa Phonon::MediaSource, Phonon::AudioOutput, VideoWidget,
     {Music Player Example}, {Phonon Overview}, Phonon::VideoPlayer,
     Phonon::createPlayer(), {Phonon Module}
diff --git a/doc/src/platforms/symbian-introduction.qdoc b/doc/src/platforms/symbian-introduction.qdoc
index 22d858f..afb17c4 100644
--- a/doc/src/platforms/symbian-introduction.qdoc
+++ b/doc/src/platforms/symbian-introduction.qdoc
@@ -51,6 +51,7 @@
         \o \l {Exception Safety with Symbian}
         \o \l {Platform Notes - Symbian} {Qt for the Symbian platform - state of support}
         \o \l {qmake Platform Notes#Symbian platform} {Qt for Symbian extensions for qmake}
+	\o \l {Symbian Platform Security Requirements} {Symbian Platform Security Requirements}
     \endlist
     \o
     \list
@@ -60,6 +61,22 @@
 */
 
 /*!
+    \page symbian-platform-security-requirements.html
+
+    \title Symbian Platform Security Requirements
+    \ingroup qtsymbian
+
+    On Symbian, processes that access media via the network must
+    have the \c NetworkServices platform security capability. If the client
+    process lacks this capability, operations will result in errors.
+    This failure is indicated by a state() of Phonon::ErrorState.
+
+    Platform security capabilities are added via the
+    \l{qmake-variable-reference.html#target-capability}{TARGET.CAPABILITY}
+    qmake variable.
+*/
+
+/*!
     \page symbian-with-qt-introduction.html
 
     \title The Symbian platform - Introduction to Qt
diff --git a/src/corelib/io/qprocess.cpp b/src/corelib/io/qprocess.cpp
index 9bc4063..739ac4d 100644
--- a/src/corelib/io/qprocess.cpp
+++ b/src/corelib/io/qprocess.cpp
@@ -1399,10 +1399,10 @@ QString QProcess::nativeArguments() const
     \since 4.7
     \overload
 
-    Sets additional native command line arguments for the program.
+    Sets additional native command line \a arguments for the program.
 
     On operating systems where the system API for passing command line
-    arguments to a subprocess natively uses a single string, one can
+    \a arguments to a subprocess natively uses a single string, one can
     conceive command lines which cannot be passed via QProcess's portable
     list-based API. In such cases this function must be used to set a
     string which is \e appended to the string composed from the usual
diff --git a/src/gui/text/qtextcursor.cpp b/src/gui/text/qtextcursor.cpp
index daa40a1..769ab2f 100644
--- a/src/gui/text/qtextcursor.cpp
+++ b/src/gui/text/qtextcursor.cpp
@@ -1283,7 +1283,7 @@ void QTextCursor::setVisualNavigation(bool b)
 /*!
   \since 4.7
 
-  Sets the visual x position for vertical cursor movements.
+  Sets the visual x position for vertical cursor movements to \a x.
 
   The vertical movement x position is cleared automatically when the cursor moves horizontally, and kept
   unchanged when the cursor moves vertically. The mechanism allows the cursor to move up and down on a
@@ -1335,8 +1335,8 @@ bool QTextCursor::keepPositionOnInsert() const
   Defines whether the cursor should keep its current position when text gets inserted at the current position of the
   cursor.
 
-  If \b is true, the cursor keeps its current position when text gets inserted at the positing of the cursor.
-  If \b is false, the cursor moves along with the inserted text.
+  If \a b is true, the cursor keeps its current position when text gets inserted at the positing of the cursor.
+  If \a b is false, the cursor moves along with the inserted text.
 
   The default is false.
 
diff --git a/src/network/socket/qtcpserver.cpp b/src/network/socket/qtcpserver.cpp
index 55f926d..0640c7c 100644
--- a/src/network/socket/qtcpserver.cpp
+++ b/src/network/socket/qtcpserver.cpp
@@ -577,7 +577,7 @@ void QTcpServer::incomingConnection(int socketDescriptor)
 
 /*!
     This function is called by QTcpServer::incomingConnection()
-    to add a socket to the list of pending incoming connections.
+    to add the \a socket to the list of pending incoming connections.
 
     \note Don't forget to call this member from reimplemented
     incomingConnection() if you do not want to break the
diff --git a/src/opengl/qgl.cpp b/src/opengl/qgl.cpp
index fc28a73..2fa33bf 100644
--- a/src/opengl/qgl.cpp
+++ b/src/opengl/qgl.cpp
@@ -1334,6 +1334,10 @@ QGLFormat::OpenGLVersionFlags Q_AUTOTEST_EXPORT qOpenGLVersionFlagsFromString(co
 
     \value OpenGL_Version_3_2  OpenGL version 3.2 or higher is present.
 
+    \value OpenGL_Version_3_3  OpenGL version 3.3 or higher is present.
+
+    \value OpenGL_Version_4_0  OpenGL version 4.0 or higher is present.
+
     \value OpenGL_ES_CommonLite_Version_1_0  OpenGL ES version 1.0 Common Lite or higher is present.
 
     \value OpenGL_ES_Common_Version_1_0  OpenGL ES version 1.0 Common or higher is present.
@@ -5037,8 +5041,9 @@ void QGLWidget::deleteTexture(QMacCompatGLuint id)
 /*!
     \since 4.4
 
-    Calls the corresponding QGLContext::drawTexture() on
-    this widget's context.
+    Calls the corresponding QGLContext::drawTexture() with
+    \a target, \a textureId, and \a textureTarget for this
+    widget's context.
 */
 void QGLWidget::drawTexture(const QRectF &target, GLuint textureId, GLenum textureTarget)
 {
@@ -5058,8 +5063,9 @@ void QGLWidget::drawTexture(const QRectF &target, QMacCompatGLuint textureId, QM
 /*!
     \since 4.4
 
-    Calls the corresponding QGLContext::drawTexture() on
-    this widget's context.
+    Calls the corresponding QGLContext::drawTexture() with
+    \a point, \a textureId, and \a textureTarget for this
+    widget's context.
 */
 void QGLWidget::drawTexture(const QPointF &point, GLuint textureId, GLenum textureTarget)
 {