summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNico Vertriest <nico.vertriest@qt.io>2020-09-23 15:11:47 +0200
committerNico Vertriest <nico.vertriest@qt.io>2020-10-20 17:56:38 +0200
commit92073a2f058c09fab4cb27a37fb42c447f79eb32 (patch)
tree83916ab781219a3e8860cda04d60a0b3769b1adf
parentf9292edc64114667e63d759e529874fe5067a370 (diff)
downloadqtdoc-92073a2f058c09fab4cb27a37fb42c447f79eb32.tar.gz
Doc: Fix link errors qtdoc
Task-number: QTBUG-86800 Change-Id: I5d49504b803f633c308e42e1827b65742d6c57bc Reviewed-by: Paul Wicking <paul.wicking@qt.io>
-rw-r--r--doc/src/datastorage.qdoc3
-rw-r--r--doc/src/development/activeqt-idc.qdoc6
-rw-r--r--doc/src/examples.qdoc8
-rw-r--r--doc/src/getting-started/controls-texteditor.qdoc14
-rw-r--r--doc/src/getting-started/examples.qdoc34
-rw-r--r--doc/src/getting-started/gettingstartedqml.qdoc5
-rw-r--r--doc/src/graphics.qdoc4
-rw-r--r--doc/src/howtos/plugins-howto.qdoc40
-rw-r--r--doc/src/howtos/scalabilityintro.qdoc5
9 files changed, 23 insertions, 96 deletions
diff --git a/doc/src/datastorage.qdoc b/doc/src/datastorage.qdoc
index 62a62ef1..e6706a79 100644
--- a/doc/src/datastorage.qdoc
+++ b/doc/src/datastorage.qdoc
@@ -168,9 +168,6 @@ The following topics provide more insight into Qt XML support:
\list
\li \l {An Introduction to Namespaces}
\li \l {XML Streaming}
-\li \l {A Short Path to XQuery}
-\li \l {XmlListModel}
-\li \l {Qt XML Patterns}
\endlist
\section1 JSON in Qt
diff --git a/doc/src/development/activeqt-idc.qdoc b/doc/src/development/activeqt-idc.qdoc
index e19b70c6..eb8c5a43 100644
--- a/doc/src/development/activeqt-idc.qdoc
+++ b/doc/src/development/activeqt-idc.qdoc
@@ -63,6 +63,8 @@
It is usually never necessary to invoke IDC manually, as the \c
qmake build system takes care of adding the required post
- processing steps to the build process. See the \l{ActiveQt}
- documentation for details.
+ processing steps to the build process.
+ \omit
+ See the \l[QtActiveQt]{ActiveQt} documentation for details.
+ \endomit
*/
diff --git a/doc/src/examples.qdoc b/doc/src/examples.qdoc
index 35b8809b..9da59abb 100644
--- a/doc/src/examples.qdoc
+++ b/doc/src/examples.qdoc
@@ -78,9 +78,11 @@
\list
\li \l{Qt for Android Examples}{Android}
\li \l{Qt for iOS Examples}{iOS}
+ \omit
\li \l{Qt Mac Extras Examples}{Mac Extras}
\li \l{Qt Windows Extras Examples}{Windows Extras}
\li \l{Active Qt#Examples}{Active Qt Examples}
+ \endomit
\endlist
\enddiv
\div {class="doc-column"}
@@ -128,10 +130,12 @@
\li \l{SQL Examples}
\li \l{XML Examples}
\li \l{JSON Save Game Example}
+ \omit
\li \l{Qt WebChannel Examples}
\li \l{Qt WebEngine Examples}
\li \l{Qt WebEngine Widgets Examples}
\li \l{Qt WebSockets Examples}{WebSocket Examples}
+ \endomit
\endlist
\enddiv
\div {class="doc-column"}
@@ -152,6 +156,7 @@
\li \l{IPC Examples}{Inter-Process Communication (IPC) Examples}
\endlist
\enddiv
+ \omit
\div {class="doc-column"}
\b{Multimedia}
\list
@@ -163,15 +168,14 @@
\li \l{Qt Multimedia Examples}{See more}
\endlist
\enddiv
+ \endomit
\div {class="doc-column"}
\b{Peripheral Devices and Location}
\list
\li \l{Qt Bluetooth Examples}{Bluetooth Examples}
\li \l{Qt Location Examples}{Location Examples}
- \li \l{Qt NFC Examples}{NFC Examples}
\li \l{Qt Positioning Examples}{Positioning Examples}
\li \l{Qt Sensors Examples}{Sensor Examples}
- \li \l{Qt Serial Port Examples}{Serial Port Examples}
\li \l{Qt SerialBus Examples}{Serial Bus Examples}
\endlist
\enddiv
diff --git a/doc/src/getting-started/controls-texteditor.qdoc b/doc/src/getting-started/controls-texteditor.qdoc
index 87a36288..6fc30da2 100644
--- a/doc/src/getting-started/controls-texteditor.qdoc
+++ b/doc/src/getting-started/controls-texteditor.qdoc
@@ -59,7 +59,7 @@ the application.
The files are part of the Qt package and are available when searched for
\uicontrol{Qt Quick Text Editor} in Qt Creator's \uicontrol{Welcome mode}.
All files used in the application are listed for viewing in the
-\l{Qt Quick Controls 1 - Text Editor Example} page.
+\l{Qt Quick Controls - Text Editor Example} page.
\section1 Setting Up the Environment and Project
@@ -72,7 +72,7 @@ that can create the project for you.
\uicontrol {Qt Quick Application} > \uicontrol Choose.
\li In the \uicontrol Name field, enter \uicontrol TextEditor and select \uicontrol Next.
\li In the \uicontrol {Qt Quick component set} field, select
- \uicontrol{Qt Quick Controls 1.2} > \uicontrol Next.
+ \uicontrol{Qt Quick Controls} > \uicontrol Next.
\li In the \uicontrol{Kit Selection} page, select \uicontrol Next.
\li In the \uicontrol{Summary} page, select \uicontrol Finish.
\endlist
@@ -105,7 +105,7 @@ later in the guide:
The text editor uses several icons to represent various actions. The icons are
in the \e images directory which is directly under the \e TextEditor project
directory. The images as well as the project files are also listed in the
-reference documentation on the \l{Qt Quick Controls 1 - Text Editor Example} page.
+reference documentation on the \l{Qt Quick Controls - Text Editor Example} page.
We first need to register the image files into the project's resource file,
\e qml.qrc. The resource files compact the images into the binary packages.
@@ -134,7 +134,7 @@ binary. For more information about resource files, see the
The accompanying examples files are listed in the following page:
\list
-\li \l{Qt Quick Controls 1 - Text Editor Example}
+\li \l{Qt Quick Controls - Text Editor Example}
\endlist
*/
@@ -331,7 +331,7 @@ QML type and \l{Signal and Handler Event System}.
The accompanying examples files are found in the following page:
\list
-\li \l{Qt Quick Controls 1 - Text Editor Example}
+\li \l{Qt Quick Controls - Text Editor Example}
\endlist
*/
@@ -521,7 +521,7 @@ these C++ functions in QML files.
The accompanying examples files are found in the following page:
\list
-\li \l{Qt Quick Controls 1 - Text Editor Example}
+\li \l{Qt Quick Controls - Text Editor Example}
\endlist
*/
@@ -679,7 +679,7 @@ and QML file are already packaged into the binary file.
The accompanying examples files are found in the following page:
\list
-\li \l{Qt Quick Controls 1 - Text Editor Example}
+\li \l{Qt Quick Controls - Text Editor Example}
\endlist
*/
diff --git a/doc/src/getting-started/examples.qdoc b/doc/src/getting-started/examples.qdoc
index 8d81ad5a..8e971467 100644
--- a/doc/src/getting-started/examples.qdoc
+++ b/doc/src/getting-started/examples.qdoc
@@ -229,31 +229,6 @@
*/
/*!
- \page examples-statemachine.html
- \ingroup all-examples
- \title State Machine Examples
- \brief Using Qt's finite state machine classes.
-
- Qt provides a powerful hierarchical finite state machine through the Qt State
- Machine classes.
-
- These examples demonstrate the fundamental aspects of implementing
- Statecharts with Qt.
-
- \list
- \li \l{statemachine/eventtransitions}{Event Transitions}\raisedaster
- \li \l{statemachine/factorial}{Factorial States}\raisedaster
- \li \l{statemachine/pingpong}{Ping Pong States}\raisedaster
- \li \l{statemachine/rogue}{Rogue}\raisedaster
- \li \l{statemachine/trafficlight}{Traffic Light}\raisedaster
- \li \l{statemachine/twowaybutton}{Two-way Button}\raisedaster
- \endlist
-
- For more information about using the Qt SCXML module to to create state
- charts from State Chart XML (SCXML) files, see \l {Qt SCXML Examples}.
-*/
-
-/*!
\page examples-animation.html
\ingroup all-examples
\title Animation Framework Examples
@@ -262,15 +237,8 @@
\image animation-examples.png Animation
\list
- \li \l{animation/animatedtiles}{Animated Tiles}
\li \l{animation/easing}{Easing Curves}
- \li \l{animation/moveblocks}{Move Blocks}\raisedaster
- \li \l{animation/states}{States}
- \li \l{animation/stickman}{Stick man}\raisedaster
- \li \l{animation/sub-attaq}{Sub-Attaq}
\endlist
-
- Examples marked with an asterisk (*) are fully documented.
*/
/*!
@@ -297,6 +265,7 @@
*/
/*!
+ \omit
\page examples-activeqt.html
\title ActiveQt Examples
\brief Using ActiveX from Qt applications.
@@ -315,4 +284,5 @@
\li \l{activeqt/simple}{Simple}\raisedaster
\li \l{activeqt/wrapper}{Wrapper}\raisedaster
\endlist
+ \endomit
*/
diff --git a/doc/src/getting-started/gettingstartedqml.qdoc b/doc/src/getting-started/gettingstartedqml.qdoc
index 64743afc..d49c587e 100644
--- a/doc/src/getting-started/gettingstartedqml.qdoc
+++ b/doc/src/getting-started/gettingstartedqml.qdoc
@@ -274,9 +274,8 @@
The app has no code for adding sound or vibration to the alarm, nor does
it store the alarms in any format or database. Maybe it could be an
- interesting coding project to add those features. Adding sound to this
- program can be realized with \l{Qt Multimedia QML Types}. Storing the data
+ interesting coding project to add those features. Storing the data
could be done quickly and easily in \l{JSON Support in Qt}{JSON format}.
- \sa {Qt Multimedia QML Types}, {JSON Support in Qt}
+ \sa {JSON Support in Qt}
*/
diff --git a/doc/src/graphics.qdoc b/doc/src/graphics.qdoc
index c7bb6c67..87c2ca4d 100644
--- a/doc/src/graphics.qdoc
+++ b/doc/src/graphics.qdoc
@@ -89,10 +89,6 @@ The most important rendering targets for QPainter are:
interface classes. QPainter will render widgets using a
QBackingStore.
- \li \l {QOpenGLWidget}{QOpenGLWidget} - A painter can also be
- opened on a QOpenGLWidget. This is provided as a convenience, since
- technically this is no different than using QOpenGLPaintDevice.
-
\endlist
QPainter and related classes are part of the \l {Qt GUI} module.
diff --git a/doc/src/howtos/plugins-howto.qdoc b/doc/src/howtos/plugins-howto.qdoc
index 111b213f..3f0cde11 100644
--- a/doc/src/howtos/plugins-howto.qdoc
+++ b/doc/src/howtos/plugins-howto.qdoc
@@ -97,41 +97,6 @@
\li \l{Qt GUI}
\li Case Sensitive
\row
- \li QAudioSystemPlugin
- \li \c audio
- \li \l{Qt Multimedia}
- \li Case Insensitive
- \row
- \li QDeclarativeVideoBackendFactoryInterface
- \li \c video/declarativevideobackend
- \li \l{Qt Multimedia}
- \li Case Insensitive
- \row
- \li QGstBufferPoolPlugin
- \li \c video/bufferpool
- \li \l{Qt Multimedia}
- \li Case Insensitive
- \row
- \li QMediaPlaylistIOPlugin
- \li \c playlistformats
- \li \l{Qt Multimedia}
- \li Case Insensitive
- \row
- \li QMediaResourcePolicyPlugin
- \li \c resourcepolicy
- \li \l{Qt Multimedia}
- \li Case Insensitive
- \row
- \li QMediaServiceProviderPlugin
- \li \c mediaservice
- \li \l{Qt Multimedia}
- \li Case Insensitive
- \row
- \li QSGVideoNodeFactoryPlugin
- \li \c video/videonode
- \li \l{Qt Multimedia}
- \li Case Insensitive
- \row
\li QBearerEnginePlugin
\li \c bearer
\li \l{Qt Network}
@@ -167,11 +132,6 @@
\li \l{Qt Quick}
\li Case Sensitive
\row
- \li QScriptExtensionPlugin
- \li \c script
- \li \l{Qt Script}
- \li Case Sensitive
- \row
\li QSensorGesturePluginInterface
\li \c sensorgestures
\li \l{Qt Sensors}
diff --git a/doc/src/howtos/scalabilityintro.qdoc b/doc/src/howtos/scalabilityintro.qdoc
index 20a605ce..4e8a302c 100644
--- a/doc/src/howtos/scalabilityintro.qdoc
+++ b/doc/src/howtos/scalabilityintro.qdoc
@@ -116,9 +116,8 @@
In addition to controls that define standard parts of application windows,
controls are provided for creating views and menus, as well as presenting or
- receiving input from users. You can use \l{Qt Quick Controls 1 Styles} to
- apply custom styling to the predefined controls. For examples of using the
- styles, see \l{Qt Quick Controls 1 - Touch Gallery}.
+ receiving input from users. You can use \l {Using Styles in Qt Quick Controls}{Qt Quick Controls Styles} to
+ apply custom styling to the predefined controls.
Qt Quick Controls, such as the ToolBar, do not provide a layout
of their own, but require you to position their contents. For this, you can