diff options
-rw-r--r--examples/gestures/imagegestures/doc/src/imagegestures.qdoc (renamed from doc/src/examples/imagegestures.qdoc)0
5 files changed, 12 insertions, 15 deletions
diff --git a/doc/src/examples/imagegestures.qdoc b/examples/gestures/imagegestures/doc/src/imagegestures.qdoc
index cb76ee83b1..cb76ee83b1 100644
--- a/doc/src/examples/imagegestures.qdoc
+++ b/examples/gestures/imagegestures/doc/src/imagegestures.qdoc
diff --git a/examples/widgets/doc/src/plugandpaint.qdoc b/examples/widgets/doc/src/plugandpaint.qdoc
index bfb763b7d1..5098d892ef 100644
--- a/examples/widgets/doc/src/plugandpaint.qdoc
+++ b/examples/widgets/doc/src/plugandpaint.qdoc
@@ -47,9 +47,9 @@
If you want to learn how to make your own application extensible
through plugins, we recommend that you start by reading this
overview, which explains how to make an application use plugins.
- Afterward, you can read the
+ Afterwards, you can read the
\l{tools/plugandpaintplugins/basictools}{Basic Tools} and
- \l{plugandpaintplugins/extrafilters}{Extra Filters}
+ \l{tools/plugandpaintplugins/extrafilters}{Extra Filters}
overviews, which show how to implement static and dynamic
plugins, respectively.
@@ -126,8 +126,8 @@
a good idea to include a version number in the string, as we did
- The \l{plugandpaintplugins/basictools}{Basic Tools} plugin
- and the \l{plugandpaintplugins/extrafilters}{Extra Filters}
+ The \l{tools/plugandpaintplugins/basictools}{Basic Tools} plugin
+ and the \l{tools/plugandpaintplugins/extrafilters}{Extra Filters}
plugin shows how to derive from \c BrushInterface, \c
ShapeInterface, and \c FilterInterface.
@@ -275,7 +275,7 @@
\section1 Importing Static Plugins
- The \l{plugandpaintplugins/basictools}{Basic Tools} plugin
+ The \l{tools/plugandpaintplugins/basictools}{Basic Tools} plugin
is built as a static plugin, to ensure that it is always
available to the application. This requires using the
Q_IMPORT_PLUGIN() macro somewhere in the application (in a \c
@@ -307,7 +307,7 @@
This completes our review of the Plug & Paint application. At
this point, you might want to take a look at the
- \l{plugandpaintplugins/basictools}{Basic Tools} example
+ \l{tools/plugandpaintplugins/basictools}{Basic Tools} example
@@ -473,7 +473,7 @@
To make the plugin a static plugin, all that is required is to
specify \c static in addition to \c plugin. The
- \l{plugandpaintplugins/extrafilters}{Extra Filters} plugin,
+ \l{tools/plugandpaintplugins/extrafilters}{Extra Filters} plugin,
which is compiled as a dynamic plugin, doesn't specify \c static
in its \c .pro file.
@@ -503,13 +503,13 @@
The Extra Filters example is a plugin for the
\l{plugandpaint}{Plug & Paint} example. It provides a set
of filters in addition to those provided by the
- \l{plugandpaintplugins/basictools}{Basic Tools} plugin.
+ \l{tools/plugandpaintplugins/basictools}{Basic Tools} plugin.
Since the approach is identical to
- \l{plugandpaintplugins/basictools}{Basic Tools}, we won't
+ \l{tools/plugandpaintplugins/basictools}{Basic Tools}, we won't
review the code here. The only part of interest is the
\c .pro file, since Extra Filters is a dynamic plugin
- (\l{plugandpaintplugins/basictools}{Basic Tools} is
+ (\l{tools/plugandpaintplugins/basictools}{Basic Tools} is
linked statically into the Plug & Paint executable).
Here's the project file for building the Extra Filters plugin:
diff --git a/src/corelib/tools/qalgorithms.qdoc b/src/corelib/tools/qalgorithms.qdoc
index 40eb2ed41d..8feb180248 100644
--- a/src/corelib/tools/qalgorithms.qdoc
+++ b/src/corelib/tools/qalgorithms.qdoc
@@ -662,9 +662,6 @@
This function requires the item type (in the example above,
QString) to implement \c operator<().
- See the \l{<QtAlgorithms>#binaryFind example}{detailed
- description} for an example usage.
\sa qLowerBound(), qUpperBound(), {random access iterators}
diff --git a/src/testlib/doc/qttestlib.qdocconf b/src/testlib/doc/qttestlib.qdocconf
index 250d237f12..92e5c97aab 100644
--- a/src/testlib/doc/qttestlib.qdocconf
+++ b/src/testlib/doc/qttestlib.qdocconf
@@ -27,7 +27,7 @@ qhp.QtTestLib.subprojects.classes.sortPages = true
tagfile = ../../../doc/qttestlib/qttestlib.tags
-depends += qtcore qtdoc qtwidgets qtgui qtquick
+depends += qtcore qtdoc qtwidgets qtgui qmake qtquick
headerdirs += ..
diff --git a/src/testlib/doc/src/qttestlib-manual.qdoc b/src/testlib/doc/src/qttestlib-manual.qdoc
index 613d2c220c..bdd9769175 100644
--- a/src/testlib/doc/src/qttestlib-manual.qdoc
+++ b/src/testlib/doc/src/qttestlib-manual.qdoc
@@ -120,7 +120,7 @@
\snippet code/ 2
- See \l{qmake Common Projects#building-a-testcase}{the qmake manual} for
+ See the \l{Building a Testcase}{qmake manual} for
more information about \c{make check}.
If you are using other build tools, make sure that you add the location