summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTopi Reinio <topi.reinio@qt.io>2019-05-21 12:49:18 +0200
committerTopi Reinio <topi.reinio@qt.io>2019-05-21 12:49:18 +0200
commit12660189b5ef1efe729de76b35794c5957c578c4 (patch)
treee42a9350854c8292ff398bd870e3d6c5cf5e24ad
parent87c8c8fa86789606806b3a7b7dd96e18f4944aec (diff)
Doc: Fix documentation warningsv5.13.0-beta4
Previous commits had introduced a number of linking issues and other problems. Linking to Qt Canvas 3D fails as the module was dropped - remove references to it. Change-Id: I7a24f82662929bc56cea4db919c02651a1a456a4 Reviewed-by: Paul Wicking <paul.wicking@qt.io>
-rw-r--r--doc/config/qtdoc.qdocconf1
-rw-r--r--doc/src/configure.qdoc4
-rw-r--r--doc/src/core.qdoc3
-rw-r--r--doc/src/getting-started/installation.qdoc2
-rw-r--r--doc/src/qtmodules.qdoc6
-rw-r--r--doc/src/source-breaks.qdoc2
-rw-r--r--doc/src/whatsnew/whatsnew513.qdoc22
7 files changed, 24 insertions, 16 deletions
diff --git a/doc/config/qtdoc.qdocconf b/doc/config/qtdoc.qdocconf
index dc2f08cdb..4883371a6 100644
--- a/doc/config/qtdoc.qdocconf
+++ b/doc/config/qtdoc.qdocconf
@@ -61,7 +61,6 @@ depends += \
qtxml \
qtxmlpatterns \
qt3d \
- qtcanvas3d \
qtwebview \
qtquickcontrols1 \
qtwaylandcompositor \
diff --git a/doc/src/configure.qdoc b/doc/src/configure.qdoc
index 079eda774..30b78ac07 100644
--- a/doc/src/configure.qdoc
+++ b/doc/src/configure.qdoc
@@ -28,7 +28,7 @@
/*!
\page configure-options.html
\title Qt Configure Options
- \brief Configuring Qt's compile options
+ \brief Configuring Qt's compile options.
\c configure is a command-line tool which determines how to build Qt for a
particular platform. Configure can exclude a feature in Qt as well
@@ -235,7 +235,7 @@
\li \l{Building Qt 5 for Android} Wiki page
\li \l{Qt for iOS - Building from Source}
\li \l{Qt for WinRT#Building from source}{Qt for WinRT - Building from Source}
- \li \l{Qt for Embedded Linux#Configuring a Specific Device}{Qt for Embedded Linux - Building from Source}
+ \li \l{Qt for Embedded Linux#Configure a Specific Device}{Qt for Embedded Linux - Building from Source}
\li \l{http://wiki.qt.io/Qt_RaspberryPi}{Qt for Raspberry Pi} - a community-driven site for
Raspberry devices
\li \l{http://wiki.qt.io/Category:Devices}{Devices} - a list of other devices and chipsets
diff --git a/doc/src/core.qdoc b/doc/src/core.qdoc
index 985ceadf0..18c73bbe4 100644
--- a/doc/src/core.qdoc
+++ b/doc/src/core.qdoc
@@ -135,6 +135,7 @@ Qt applications which support third-party plugins.
\li \l{Qt Platform Abstraction}
\li \l{Implementing Atomic Operations} - for new architectures
\li \l{How to Create Qt Plugins}
-\li \l{Endian Conversion Functions} - functions for handling endianness from the QtEndian header
+\li \l{<QtEndian>}{Endian Conversion Functions} - functions for handling
+ endianness from the QtEndian header
\endlist
*/
diff --git a/doc/src/getting-started/installation.qdoc b/doc/src/getting-started/installation.qdoc
index 3416fcd73..ecbc035ec 100644
--- a/doc/src/getting-started/installation.qdoc
+++ b/doc/src/getting-started/installation.qdoc
@@ -77,7 +77,7 @@ visit the following page:
\section1 Embedded Linux
\list
-\li \l{Qt for Embedded Linux#Configuring a Specific Device}
+\li \l{Qt for Embedded Linux#Configure a Specific Device}
{Qt for Embedded Linux - Building from Source}
\endlist
diff --git a/doc/src/qtmodules.qdoc b/doc/src/qtmodules.qdoc
index 553c33f2d..aef4453b4 100644
--- a/doc/src/qtmodules.qdoc
+++ b/doc/src/qtmodules.qdoc
@@ -160,12 +160,6 @@
\l{Qt for WinRT}{WinRT}
\li Provides access to Bluetooth hardware.
\row
- \li \l[QtCanvas3D]{Qt Canvas 3D} (Deprecated)
- \li All
- \li All
- \li Enables OpenGL-like 3D drawing calls from Qt Quick applications
- using JavaScript.
- \row
\li \l[QtConcurrent]{Qt Concurrent}
\li All
\li All
diff --git a/doc/src/source-breaks.qdoc b/doc/src/source-breaks.qdoc
index eb84c4c92..5f4595503 100644
--- a/doc/src/source-breaks.qdoc
+++ b/doc/src/source-breaks.qdoc
@@ -721,7 +721,7 @@ recommendations for handling those changes.
\li \c{QTest::qt_snprintf()} is removed. This was an
internal test library function that was exposed in the public API due to its use
in a public macro. Any calls to this function must be replaced with
- \l{bytearray-qsnprintf}{QByteArray::qsnprintf()}.
+ \l{QByteArray::qsnprintf()}.
\li c{QTest::pixmapsAreEqual()} is removed. Comparison of \l{QPixmap} objects must
be done using the \c{QCOMPARE} macro, which provides more informative output in the event of a failure.
\li The \c{"mode"} parameter in \c{QSKIP} macro is removed. This parameter caused problems
diff --git a/doc/src/whatsnew/whatsnew513.qdoc b/doc/src/whatsnew/whatsnew513.qdoc
index e5226b79a..6af60fb42 100644
--- a/doc/src/whatsnew/whatsnew513.qdoc
+++ b/doc/src/whatsnew/whatsnew513.qdoc
@@ -67,7 +67,7 @@
\section2 Qt Location Module
\list
- \li Added support for \l [QML]{GeoPolygon}{GeoPolygons} with holes,
+ \li Added support for \l [QML]{geopolygon}{geopolygons} with holes,
reflected in \l [QML]{MapPolygon}{MapPolygons} and
\l [QML]{MapPolygonObject}{MapPolygonObjects}.
\li Introduced interoperability with \e GeoJSON, adding import/export
@@ -197,7 +197,6 @@
\li \l{Obsolete Classes}
\endlist
- //! [whatsnew-previous]
\section1 Additions to Other Qt 5 Releases
\list
@@ -215,7 +214,6 @@
\li \l{What's New in Qt 5.1}
\li \l{What's New in Qt 5.0}
\endlist
- //! [whatsnew-previous]
*/
/*!
@@ -229,5 +227,21 @@
\sincelist 5.13
- \include whatsnew513.qdoc whatsnew-previous
+ \section1 Additions to Other Qt 5 Releases
+
+ \list
+ \li \l{What's New in Qt 5.12}
+ \li \l{What's New in Qt 5.11}
+ \li \l{What's New in Qt 5.10}
+ \li \l{What's New in Qt 5.9}
+ \li \l{What's New in Qt 5.8}
+ \li \l{What's New in Qt 5.7}
+ \li \l{What's New in Qt 5.6}
+ \li \l{What's New in Qt 5.5}
+ \li \l{What's New in Qt 5.4}
+ \li \l{What's New in Qt 5.3}
+ \li \l{What's New in Qt 5.2}
+ \li \l{What's New in Qt 5.1}
+ \li \l{What's New in Qt 5.0}
+ \endlist
*/