summaryrefslogtreecommitdiffstats
path: root/src/corelib
diff options
context:
space:
mode:
Diffstat (limited to 'src/corelib')
-rw-r--r--src/corelib/io/qdebug.cpp2
-rw-r--r--src/corelib/kernel/qcoreapplication.cpp2
-rw-r--r--src/corelib/kernel/qmetatype.cpp8
-rw-r--r--src/corelib/thread/qsemaphore.cpp2
-rw-r--r--src/corelib/thread/qwaitcondition.qdoc2
-rw-r--r--src/corelib/tools/qchar.cpp1
-rw-r--r--src/corelib/tools/qeasingcurve.cpp2
-rw-r--r--src/corelib/tools/qregexp.cpp2
8 files changed, 11 insertions, 10 deletions
diff --git a/src/corelib/io/qdebug.cpp b/src/corelib/io/qdebug.cpp
index 9cb5609dac..b8cd0f70b2 100644
--- a/src/corelib/io/qdebug.cpp
+++ b/src/corelib/io/qdebug.cpp
@@ -384,7 +384,7 @@ QDebugStateSaver::QDebugStateSaver(QDebug &dbg)
/*!
Destroyes a QDebugStateSaver instance, which restores the settings
- used by \a dbg when the QDebugStateSaver instance was created.
+ used when the QDebugStateSaver instance was created.
\sa QDebug::setAutoInsertSpaces(), QDebug::autoInsertSpaces()
*/
diff --git a/src/corelib/kernel/qcoreapplication.cpp b/src/corelib/kernel/qcoreapplication.cpp
index 1ccf5f2197..f3caa1d918 100644
--- a/src/corelib/kernel/qcoreapplication.cpp
+++ b/src/corelib/kernel/qcoreapplication.cpp
@@ -2203,7 +2203,7 @@ QString QCoreApplication::organizationDomain()
If not set, the application name defaults to the executable name (since 5.0).
- \sa organizationName, organizationDomain, applicationVersion, applicationFilePath
+ \sa organizationName, organizationDomain, applicationVersion, applicationFilePath()
*/
/*!
\fn void QCoreApplication::applicationNameChanged()
diff --git a/src/corelib/kernel/qmetatype.cpp b/src/corelib/kernel/qmetatype.cpp
index 70c2e236dd..a9ba4aaaad 100644
--- a/src/corelib/kernel/qmetatype.cpp
+++ b/src/corelib/kernel/qmetatype.cpp
@@ -354,7 +354,7 @@ struct DefinedTypesFilter {
This function is typically used together with construct()
to perform low-level management of the memory used by a type.
- \sa QMetaType::construct(void *where, const void *copy), QMetaType::sizeOf(int)
+ \sa QMetaType::construct(), QMetaType::sizeOf()
*/
/*!
@@ -363,7 +363,7 @@ struct DefinedTypesFilter {
Returns flags of the type for which this QMetaType instance was constructed.
- \sa QMetaType::TypeFlags, QMetaType::typeFlags(int type)
+ \sa QMetaType::TypeFlags, QMetaType::typeFlags()
*/
/*!
@@ -380,7 +380,7 @@ struct DefinedTypesFilter {
QMetaType instance was created for. If \a copy is null, creates
a default constructed instance.
- \sa QMetaType::destroy(void*)
+ \sa QMetaType::destroy()
*/
/*!
@@ -390,7 +390,7 @@ struct DefinedTypesFilter {
Destroys the \a data, assuming it is of the type that this
QMetaType instance was created for.
- \sa QMetaType::create(const void *)
+ \sa QMetaType::create()
*/
/*!
diff --git a/src/corelib/thread/qsemaphore.cpp b/src/corelib/thread/qsemaphore.cpp
index 1cf893f42c..90e4f2a20a 100644
--- a/src/corelib/thread/qsemaphore.cpp
+++ b/src/corelib/thread/qsemaphore.cpp
@@ -83,7 +83,7 @@ QT_BEGIN_NAMESPACE
A typical application of semaphores is for controlling access to
a circular buffer shared by a producer thread and a consumer
- thread. The \l{threads/semaphores}{Semaphores} example shows how
+ thread. The \l{Semaphores Example} shows how
to use QSemaphore to solve that problem.
A non-computing example of a semaphore would be dining at a
diff --git a/src/corelib/thread/qwaitcondition.qdoc b/src/corelib/thread/qwaitcondition.qdoc
index 9aa633a210..b1a396d504 100644
--- a/src/corelib/thread/qwaitcondition.qdoc
+++ b/src/corelib/thread/qwaitcondition.qdoc
@@ -75,7 +75,7 @@
simultaneously are unpredictable.
Wait conditions are a powerful thread synchronization primitive.
- The \l{threads/waitconditions}{Wait Conditions} example shows how
+ The \l{Wait Conditions Example} example shows how
to use QWaitCondition as an alternative to QSemaphore for
controlling access to a circular buffer shared by a producer
thread and a consumer thread.
diff --git a/src/corelib/tools/qchar.cpp b/src/corelib/tools/qchar.cpp
index 5de06d8c4a..ff17a52a75 100644
--- a/src/corelib/tools/qchar.cpp
+++ b/src/corelib/tools/qchar.cpp
@@ -506,6 +506,7 @@ QT_BEGIN_NAMESPACE
\value CarriageReturn
\value Space
\value Nbsp Non-breaking space.
+ \value SoftHyphen
\value ReplacementCharacter The character shown when a font has no glyph
for a certain codepoint. A special question mark character is often
used. Codecs use this codepoint when input data cannot be
diff --git a/src/corelib/tools/qeasingcurve.cpp b/src/corelib/tools/qeasingcurve.cpp
index 67e0711796..23451f095c 100644
--- a/src/corelib/tools/qeasingcurve.cpp
+++ b/src/corelib/tools/qeasingcurve.cpp
@@ -290,7 +290,7 @@
\value BezierSpline Allows defining a custom easing curve using a cubic bezier spline
\sa addCubicBezierSegment()
\value TCBSpline Allows defining a custom easing curve using a TCB spline
- \sa addTCBSegment
+ \sa addTCBSegment()
\value Custom This is returned if the user specified a custom curve type with
setCustomType(). Note that you cannot call setType() with this value,
but type() can return it.
diff --git a/src/corelib/tools/qregexp.cpp b/src/corelib/tools/qregexp.cpp
index 086cdeb108..c0cd419c53 100644
--- a/src/corelib/tools/qregexp.cpp
+++ b/src/corelib/tools/qregexp.cpp
@@ -285,7 +285,7 @@ int qFindString(const QChar *haystack, int haystackLen, int from,
\row \li \b{\\W}
\li Matches a non-word character.
\row \li \b{\\\e{n}}
- \li The \e{n}-th \l backreference, e.g. \\1, \\2, etc.
+ \li The \e{n}-th backreference, e.g. \\1, \\2, etc.
\endtable
\b{Note:} The C++ compiler transforms backslashes in strings.