Doc: Fix link issues for QtCore

- Fix linking to CMake manual.
- Remove references to the state machine framework.

Task-number: QTBUG-86295
Change-Id: I01a61088da8eb36760949f39be5e71d92de956f2
Reviewed-by: Paul Wicking <paul.wicking@qt.io>
This commit is contained in:
Topi Reinio 2020-10-29 17:31:13 +01:00
parent 13e978e827
commit f604fe6d1d
5 changed files with 11 additions and 21 deletions

View File

@ -136,9 +136,8 @@
and \c "save.dat" for CBOR. We print a warning and return \c false if the
file couldn't be opened.
Since QJsonDocument's \l{QJsonDocument::fromJson()}{fromJson()} and
\l{QJsonDocument::fromBinaryData()}{fromBinaryData()} functions both take a
QByteArray, we can read the entire contents of the save file into one,
Since \l QJsonDocument::fromJson() and \l QCborValue::fromCbor() both take
a QByteArray, we can read the entire contents of the save file into one,
regardless of the save format.
After constructing the QJsonDocument, we instruct the Game object to read

View File

@ -93,15 +93,6 @@
animations. Note also that the groups are subclasses of
QAbstractAnimation, so groups can themselves contain other groups.
The animation framework can be used on its own, but is also
designed to be part of the state machine framework (See the
\l{The State Machine Framework}{state machine framework} for an
introduction to the Qt state machine). The state machine provides
a special state that can play an animation. A QState can also set
properties when the state is entered or exited, and this special
animation state will interpolate between these values when given a
QPropertyAnimation. We will look more closely at this later.
Behind the scenes, the animations are controlled by a global
timer, which sends \l{QAbstractAnimation::updateCurrentTime()}{updates} to
all animations that are playing.

View File

@ -416,8 +416,9 @@
QT += core5compat
\endcode
In case you already ported your application or library to the \l cmake
build system, add the following to your \c CMakeList.txt:
In case you already ported your application or library to the
\l {Build with CMake}{cmake} build system, add the following to your
\c CMakeList.txt:
\code
PUBLIC_LIBRARIES
Qt::Core5Compat
@ -785,8 +786,9 @@
QT += core5compat
\endcode
In case you already ported your application or library to the \l cmake
build system, add the following to your \c CMakeList.txt:
In case you already ported your application or library to the
\l {Build with CMake}{cmake} build system, add the following to your
\c CMakeList.txt:
\code
PUBLIC_LIBRARIES
Qt::Core5Compat

View File

@ -56,7 +56,7 @@
\include module-use.qdocinc using qt module
\quotefile overview/using-qt-core.cmake
See also the \l[QtDoc]{Build with CMake} overview.
See also the \l {Build with CMake} overview.
\section2 Building with qmake
@ -97,7 +97,6 @@
\list
\li \l{The Animation Framework}
\li \l{JSON Support in Qt}
\li \l{The State Machine Framework}
\li \l{How to Create Qt Plugins}
\li \l{The Event System}
\endlist
@ -135,7 +134,6 @@
\li \l{Container Classes}
\li \l{Plugin Classes}
\li \l{Implicitly Shared Classes}
\li \l{State Machine Classes}
\li \l{Input/Output and Networking}{Input/Output Classes}
\li \l{Event Classes}
\endlist

View File

@ -695,9 +695,9 @@ inline QRandomGenerator::SystemGenerator &QRandomGenerator::SystemGenerator::sel
/*!
\fn bool QRandomGenerator::operator!=(const QRandomGenerator &rng1, const QRandomGenerator &rng2)
Returns true if the two the two engines \a rng1 and \a rng2 are at
Returns \c true if the two the two engines \a rng1 and \a rng2 are at
different states or if one of them is reading from the operating system
facilities and the other is not, false otherwise.
facilities and the other is not, \c false otherwise.
*/
/*!