diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/corelib/doc/src/containers.qdoc | 2 | ||||
| -rw-r--r-- | src/corelib/kernel/qmetaobject.cpp | 2 | ||||
| -rw-r--r-- | src/corelib/kernel/qmetatype.cpp | 2 | ||||
| -rw-r--r-- | src/corelib/plugin/qplugin.qdoc | 2 | ||||
| -rw-r--r-- | src/dbus/qdbusconnection.cpp | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/src/corelib/doc/src/containers.qdoc b/src/corelib/doc/src/containers.qdoc index 58c7569964..1979c45e17 100644 --- a/src/corelib/doc/src/containers.qdoc +++ b/src/corelib/doc/src/containers.qdoc @@ -465,7 +465,7 @@ imaginary item one position past the last item in the container. \l {QList::end()}{end()} marks an invalid position; it must never be dereferenced. It is typically used in a loop's break condition. If the list is - empty, \l{QList::begin}{begin()} equals \l{QList:end()}{end()}, so we never execute the loop. + empty, \l{QList::begin}{begin()} equals \l{QList::end()}{end()}, so we never execute the loop. The diagram below shows the valid iterator positions as red arrows for a vector containing four items: diff --git a/src/corelib/kernel/qmetaobject.cpp b/src/corelib/kernel/qmetaobject.cpp index 4baf09167b..e7be2339da 100644 --- a/src/corelib/kernel/qmetaobject.cpp +++ b/src/corelib/kernel/qmetaobject.cpp @@ -2678,7 +2678,7 @@ QByteArray QMetaEnum::valueToKeys(int value) const } /*! - \fn QMetaEnum QMetaEnum::fromType() const + \fn QMetaEnum QMetaEnum::fromType() \since 5.5 Returns the QMetaEnum corresponding to the type in the template parameter. diff --git a/src/corelib/kernel/qmetatype.cpp b/src/corelib/kernel/qmetatype.cpp index 8adb4a4903..305e998818 100644 --- a/src/corelib/kernel/qmetatype.cpp +++ b/src/corelib/kernel/qmetatype.cpp @@ -1117,7 +1117,7 @@ bool QMetaType::isRegistered(int type) } /*! - \fn int qMetaTypeTypeImpl(const char *typeName) + \fn int qMetaTypeTypeImpl(const char *typeName, int length) \internal Implementation of QMetaType::type(). diff --git a/src/corelib/plugin/qplugin.qdoc b/src/corelib/plugin/qplugin.qdoc index 35dd52218a..81be1df518 100644 --- a/src/corelib/plugin/qplugin.qdoc +++ b/src/corelib/plugin/qplugin.qdoc @@ -44,7 +44,7 @@ to the interface class called \a ClassName. The \a Identifier must be unique. For example: - \snippet plugins/interfaces.h 3 + \snippet code/doc_src_qplugin.cpp 0 This macro is normally used right after the class definition for \a ClassName, in a header file. See the diff --git a/src/dbus/qdbusconnection.cpp b/src/dbus/qdbusconnection.cpp index ff897faab6..5dc18fe908 100644 --- a/src/dbus/qdbusconnection.cpp +++ b/src/dbus/qdbusconnection.cpp @@ -1110,7 +1110,7 @@ QDBusConnection QDBusConnection::systemBus() \deprecated Always returns a disconnected, invalid QDBusConnection object. For the old - functionality of determining the sender connection, please use \ref QDBusContext. + functionality of determining the sender connection, please use QDBusContext. \sa QDBusContext */ |