summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNico Vertriest <nico.vertriest@digia.com>2013-12-11 10:50:16 +0100
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-12-20 10:38:01 +0100
commitac90b4c46f11ec08a9f4eebf909f9c66f10e4288 (patch)
tree863ef697160481364ba0826dbe725c8cd6ed7cf2
parent04133551a51213e48fe1972bcbcbdba53e24043b (diff)
Doc: corrected broken links
Task-number: QTBUG-34749 Corrected link to drag and drop example. Corrected link to {mandatory fields} Created target referring to macros for defining plugins Change-Id: I387a2d9bab428b2eacd8d371f08c72f42f7e2be2 Reviewed-by: Topi Reiniƶ <topi.reinio@digia.com>
-rw-r--r--examples/widgets/doc/src/classwizard.qdoc2
-rw-r--r--examples/widgets/doc/src/echoplugin.qdoc6
-rw-r--r--src/corelib/plugin/qplugin.qdoc1
-rw-r--r--src/gui/doc/src/dnd.qdoc4
4 files changed, 7 insertions, 6 deletions
diff --git a/examples/widgets/doc/src/classwizard.qdoc b/examples/widgets/doc/src/classwizard.qdoc
index 5a88076155..cc2c61f126 100644
--- a/examples/widgets/doc/src/classwizard.qdoc
+++ b/examples/widgets/doc/src/classwizard.qdoc
@@ -156,7 +156,7 @@
Then we create the child widgets, create \l{Registering and Using
Fields}{wizard fields} associated with them, and put them into
layouts. The \c className field is created with an asterisk (\c
- *) next to its name. This makes it a \l{mandatory field}, that
+ *) next to its name. This makes it a \l{mandatory fields}{mandatory field}, that
is, a field that must be filled before the user can press the
\uicontrol Next button (\uicontrol Continue on Mac OS X). The fields' values
can be accessed from any other page using QWizardPage::field(),
diff --git a/examples/widgets/doc/src/echoplugin.qdoc b/examples/widgets/doc/src/echoplugin.qdoc
index 9e2b0c35de..103a51cf93 100644
--- a/examples/widgets/doc/src/echoplugin.qdoc
+++ b/examples/widgets/doc/src/echoplugin.qdoc
@@ -194,10 +194,10 @@
\section1 Further reading and examples
- You can find an overview of the macros needed to create plugins
- \l{Macros for Defining Plugins}{here}.
+ The \l {qtplugin-defining-plugins}{Defining Plugins} page presents an overview of the macros needed to
+ create plugins.
- We give an example of a plugin that extend Qt in the \l{Style
+ We give an example of a plugin that extends Qt in the \l{Style
Plugin Example}{style plugin} example. The \l{Plug & Paint
Example}{plug and paint} example shows how to create static
plugins.
diff --git a/src/corelib/plugin/qplugin.qdoc b/src/corelib/plugin/qplugin.qdoc
index 0a94077d95..b72516eae5 100644
--- a/src/corelib/plugin/qplugin.qdoc
+++ b/src/corelib/plugin/qplugin.qdoc
@@ -28,6 +28,7 @@
/*!
\headerfile <QtPlugin>
\title Defining Plugins
+ \target qtplugin-defining-plugins
\ingroup plugins
\brief The <QtPlugin> header file defines macros for defining plugins.
diff --git a/src/gui/doc/src/dnd.qdoc b/src/gui/doc/src/dnd.qdoc
index 1c6ca9c81c..9f7fdc7fbf 100644
--- a/src/gui/doc/src/dnd.qdoc
+++ b/src/gui/doc/src/dnd.qdoc
@@ -80,8 +80,8 @@
The rest of the document focuses mainly on how to implement drag and drop
in C++. For using drag and drop inside a Qt Quick scene, please read the
- documentation for the Qt Quick \l{Drag}, \l{DragEvent} and \l{DropArea} items.
- There is also an example \l{quick/draganddrop}{available}.
+ documentation for the Qt Quick \l{Drag}, \l{DragEvent}, and \l{DropArea} items,
+ as well as the \l {Qt Quick Examples - Drag and Drop}{Qt Quick Drag and Drop} examples.
\section1 Dragging