diff options
author | Sze Howe Koh <szehowe.koh@gmail.com> | 2014-02-01 23:30:08 +0800 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-02-04 01:30:24 +0100 |
commit | 8bb5dba0cba4d953794124d7f1b33887d1b5bd8d (patch) | |
tree | 42a7971a92ddab645a5a9b9312973f35d489eadb /src/corelib | |
parent | 6894bc0f3f8a579529dc0a7ab869ce565abd06ad (diff) |
Doc: Fix broken links
Change-Id: Ic275dfbf0b332fc34ea0fac1c31c4935ad961527
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
Diffstat (limited to 'src/corelib')
-rw-r--r-- | src/corelib/doc/qtcore.qdocconf | 2 | ||||
-rw-r--r-- | src/corelib/global/qglobal.cpp | 8 | ||||
-rw-r--r-- | src/corelib/io/qloggingcategory.cpp | 2 | ||||
-rw-r--r-- | src/corelib/kernel/qvariant.cpp | 6 | ||||
-rw-r--r-- | src/corelib/tools/qstring.cpp | 2 |
5 files changed, 10 insertions, 10 deletions
diff --git a/src/corelib/doc/qtcore.qdocconf b/src/corelib/doc/qtcore.qdocconf index fa5afb033c..18fdfb18f3 100644 --- a/src/corelib/doc/qtcore.qdocconf +++ b/src/corelib/doc/qtcore.qdocconf @@ -26,7 +26,7 @@ qhp.QtCore.subprojects.classes.sortPages = true tagfile = ../../../doc/qtcore/qtcore.tags -depends += qtgui qtwidgets qtnetwork qtdoc qtquick qtlinguist qtdesigner qtconcurrent qtxml qmake +depends += qtgui qtwidgets qtnetwork qtdoc qtmacextras qtquick qtlinguist qtdesigner qtconcurrent qtxml qmake headerdirs += .. diff --git a/src/corelib/global/qglobal.cpp b/src/corelib/global/qglobal.cpp index 6644d6d101..a9f6df6291 100644 --- a/src/corelib/global/qglobal.cpp +++ b/src/corelib/global/qglobal.cpp @@ -1960,7 +1960,7 @@ const QSysInfo::WinVersion QSysInfo::WindowsVersion = QSysInfo::windowsVersion() conditions that it would not otherwise know about. However, there is no guarantee that the compiler will actually use those hints. - This macro could be considered a "lighter" version of \l{Q_ASSERT}. While + This macro could be considered a "lighter" version of \l{Q_ASSERT()}. While Q_ASSERT will abort the program's execution if the condition is false, Q_ASSUME will tell the compiler not to generate code for those conditions. Therefore, it is important that the assumptions always hold, otherwise @@ -3318,7 +3318,7 @@ bool QInternal::activateCallbacks(Callback cb, void **parameters) If you need C++11 noexcept semantics, don't use this macro, use Q_DECL_NOEXCEPT/Q_DECL_NOEXCEPT_EXPR instead. - \sa Q_DECL_NOEXCEPT, Q_DECL_NOEXCEPT_EXPR + \sa Q_DECL_NOEXCEPT, Q_DECL_NOEXCEPT_EXPR() */ /*! @@ -3372,7 +3372,7 @@ bool QInternal::activateCallbacks(Callback cb, void **parameters) function can't possibly throw, don't use this macro, use Q_DECL_NOTHROW instead. - \sa Q_DECL_NOTHROW, Q_DECL_NOEXCEPT_EXPR + \sa Q_DECL_NOTHROW, Q_DECL_NOEXCEPT_EXPR() */ /*! @@ -3394,7 +3394,7 @@ bool QInternal::activateCallbacks(Callback cb, void **parameters) function can't possibly throw, don't use this macro, use Q_DECL_NOTHROW instead. - \sa Q_DECL_NOTHROW, Q_DECL_NOEXCEPT_EXPR + \sa Q_DECL_NOTHROW, Q_DECL_NOEXCEPT */ /*! diff --git a/src/corelib/io/qloggingcategory.cpp b/src/corelib/io/qloggingcategory.cpp index 93a98b1835..4924ac89c6 100644 --- a/src/corelib/io/qloggingcategory.cpp +++ b/src/corelib/io/qloggingcategory.cpp @@ -72,7 +72,7 @@ Q_GLOBAL_STATIC_WITH_ARGS(QLoggingCategory, qtDefaultCategory, \section1 Checking category configuration QLoggingCategory provides \l isDebugEnabled(), \l isWarningEnabled(), - \l isCriticalEnabled(), \l isTraceEnabled(), as well as \l isEnabled() + \l isCriticalEnabled(), as well as \l isEnabled() to check whether messages for the given message type should be logged. \note The qCDebug(), qCWarning(), qCCritical() macros prevent arguments diff --git a/src/corelib/kernel/qvariant.cpp b/src/corelib/kernel/qvariant.cpp index 69cfa7888f..a1b7f398e8 100644 --- a/src/corelib/kernel/qvariant.cpp +++ b/src/corelib/kernel/qvariant.cpp @@ -2833,8 +2833,8 @@ static bool canConvertMetaObject(int fromId, int toId, QObject *fromObject) \snippet code/src_corelib_kernel_qvariant.cpp 10 - \sa convert(), QSequentialIterable, qRegisterSequentialConverter(), QAssociativeIterable, - qRegisterAssociativeConverter() + \sa convert(), QSequentialIterable, Q_DECLARE_SEQUENTIAL_CONTAINER_METATYPE(), QAssociativeIterable, + Q_DECLARE_ASSOCIATIVE_CONTAINER_METATYPE() */ bool QVariant::canConvert(int targetTypeId) const { @@ -3334,7 +3334,7 @@ QDebug operator<<(QDebug dbg, const QVariant::Type p) \snippet code/src_corelib_kernel_qvariant.cpp 9 - \sa setValue(), fromValue(), canConvert(), qRegisterSequentialConverter() + \sa setValue(), fromValue(), canConvert(), Q_DECLARE_SEQUENTIAL_CONTAINER_METATYPE() */ /*! \fn bool QVariant::canConvert() const diff --git a/src/corelib/tools/qstring.cpp b/src/corelib/tools/qstring.cpp index d682207314..2c505ef033 100644 --- a/src/corelib/tools/qstring.cpp +++ b/src/corelib/tools/qstring.cpp @@ -7691,7 +7691,7 @@ QString &QString::setRawData(const QChar *unicode, int size) \snippet code/src_corelib_tools_qstring.cpp 6 - \sa QString, QLatin1Char, QStringLiteral + \sa QString, QLatin1Char, {QStringLiteral()}{QStringLiteral} */ /*! \fn QLatin1String::QLatin1String(const char *str) |