From f604fe6d1d91b32cb73cb3b5dda0a7e07472b03f Mon Sep 17 00:00:00 2001 From: Topi Reinio Date: Thu, 29 Oct 2020 17:31:13 +0100 Subject: 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 --- src/corelib/doc/src/animation.qdoc | 9 --------- src/corelib/doc/src/qt6-changes.qdoc | 10 ++++++---- src/corelib/doc/src/qtcore-index.qdoc | 4 +--- 3 files changed, 7 insertions(+), 16 deletions(-) (limited to 'src/corelib/doc/src') 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 -- cgit v1.2.3