diff options
-rw-r--r-- | examples/corelib/serialization/savegame/doc/src/savegame.qdoc | 5 | ||||
-rw-r--r-- | src/corelib/doc/src/animation.qdoc | 9 | ||||
-rw-r--r-- | src/corelib/doc/src/qt6-changes.qdoc | 10 | ||||
-rw-r--r-- | src/corelib/doc/src/qtcore-index.qdoc | 4 | ||||
-rw-r--r-- | src/corelib/global/qrandom.cpp | 4 |
5 files changed, 11 insertions, 21 deletions
diff --git a/examples/corelib/serialization/savegame/doc/src/savegame.qdoc b/examples/corelib/serialization/savegame/doc/src/savegame.qdoc index 7f138ff110..84807e57dc 100644 --- a/examples/corelib/serialization/savegame/doc/src/savegame.qdoc +++ b/examples/corelib/serialization/savegame/doc/src/savegame.qdoc @@ -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 diff --git a/src/corelib/doc/src/animation.qdoc b/src/corelib/doc/src/animation.qdoc index 16569ded0b..d67ac2e505 100644 --- a/src/corelib/doc/src/animation.qdoc +++ b/src/corelib/doc/src/animation.qdoc @@ -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. diff --git a/src/corelib/doc/src/qt6-changes.qdoc b/src/corelib/doc/src/qt6-changes.qdoc index adf9dc2e80..cdbb86cc21 100644 --- a/src/corelib/doc/src/qt6-changes.qdoc +++ b/src/corelib/doc/src/qt6-changes.qdoc @@ -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 diff --git a/src/corelib/doc/src/qtcore-index.qdoc b/src/corelib/doc/src/qtcore-index.qdoc index 5309eb14da..a8560d3f0d 100644 --- a/src/corelib/doc/src/qtcore-index.qdoc +++ b/src/corelib/doc/src/qtcore-index.qdoc @@ -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 diff --git a/src/corelib/global/qrandom.cpp b/src/corelib/global/qrandom.cpp index b2ddfa6157..b71097926c 100644 --- a/src/corelib/global/qrandom.cpp +++ b/src/corelib/global/qrandom.cpp @@ -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. */ /*! |