summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Smith <msmith@trolltech.com>2009-07-03 10:08:25 +0200
committerMartin Smith <msmith@trolltech.com>2009-07-03 10:08:25 +0200
commit95e4c95d28be9bc9d94685f7a13e36cbf57bf74e (patch)
tree0138e71fbdc56817cf67229f7608532c38443143
parent1752e03a97cc16dd653d68d5a4bcf24024c59980 (diff)
doc: Corrected several qdoc warnings.
-rw-r--r--doc/src/qmake-manual.qdoc5
-rw-r--r--src/corelib/tools/qsharedpointer.cpp6
-rw-r--r--src/dbus/qdbuserror.cpp10
-rw-r--r--src/gui/kernel/qgesture.cpp7
4 files changed, 22 insertions, 6 deletions
diff --git a/doc/src/qmake-manual.qdoc b/doc/src/qmake-manual.qdoc
index 42921db1a7..5b261abb9d 100644
--- a/doc/src/qmake-manual.qdoc
+++ b/doc/src/qmake-manual.qdoc
@@ -1037,8 +1037,9 @@
(see \l{LibDepend}{Library Dependencies} for more info).
\endtable
- Please note that \c create_prl is required when \i {building} a static library,
- while \c link_prl is required when \i {using} a static library.
+ Please note that \c create_prl is required when \e {building} a
+ static library, while \c link_prl is required when \e {using} a
+ static library.
On Windows (or if Qt is configured with \c{-debug_and_release}, adding the
\c build_all option to the \c CONFIG variable makes this rule the default
diff --git a/src/corelib/tools/qsharedpointer.cpp b/src/corelib/tools/qsharedpointer.cpp
index 71bf3182ff..fe3d9e0b8c 100644
--- a/src/corelib/tools/qsharedpointer.cpp
+++ b/src/corelib/tools/qsharedpointer.cpp
@@ -342,7 +342,7 @@
/*!
\fn QSharedPointer<X> QSharedPointer::objectCast() const
- Performs a \ref qobject_cast from this pointer's type to \tt X and
+ Performs a \l qobject_cast() from this pointer's type to \tt X and
returns a QSharedPointer that shares the reference. If this
function is used to up-cast, then QSharedPointer will perform a \tt
qobject_cast, which means that if the object being pointed by this
@@ -739,7 +739,7 @@
\relates QSharedPointer
Returns a shared pointer to the pointer held by \a other, using a
- \ref qobject_cast to type \tt X to obtain an internal pointer of the
+ \l qobject_cast() to type \tt X to obtain an internal pointer of the
appropriate type. If the \tt qobject_cast fails, the object
returned will be null.
@@ -756,7 +756,7 @@
\relates QWeakPointer
Returns a shared pointer to the pointer held by \a other, using a
- \ref qobject_cast to type \tt X to obtain an internal pointer of the
+ \l qobject_cast() to type \tt X to obtain an internal pointer of the
appropriate type. If the \tt qobject_cast fails, the object
returned will be null.
diff --git a/src/dbus/qdbuserror.cpp b/src/dbus/qdbuserror.cpp
index b2d21ecca3..caa24374fa 100644
--- a/src/dbus/qdbuserror.cpp
+++ b/src/dbus/qdbuserror.cpp
@@ -225,8 +225,16 @@ static inline QDBusError::ErrorType get(const char *name)
\value UnknownInterface The interface is not known
\value InternalError An internal error occurred
(\c com.trolltech.QtDBus.Error.InternalError)
- \value UnknownObject The remote object could not be found.
+ \value InvalidObjectPath The object path provided is invalid.
+
+ \value InvalidService The service requested is invalid.
+
+ \value InvalidMember The member is invalid.
+
+ \value InvalidInterface The interface is invalid.
+
+ \value UnknownObject The remote object could not be found.
*/
/*!
diff --git a/src/gui/kernel/qgesture.cpp b/src/gui/kernel/qgesture.cpp
index 32a219cef1..d53b419d5d 100644
--- a/src/gui/kernel/qgesture.cpp
+++ b/src/gui/kernel/qgesture.cpp
@@ -187,11 +187,18 @@ bool QGesture::eventFilter(QObject *receiver, QEvent *event)
\brief The current state of the gesture.
*/
+
+/*!
+ Returns the gesture recognition state.
+ */
Qt::GestureState QGesture::state() const
{
return d_func()->state;
}
+/*!
+ Sets this gesture's recognition state to \a state.
+ */
void QGesture::setState(Qt::GestureState state)
{
d_func()->state = state;