summaryrefslogtreecommitdiffstats
path: root/src/corelib/doc/src
diff options
context:
space:
mode:
authorGiuseppe D'Angelo <giuseppe.dangelo@kdab.com>2012-05-11 01:38:45 +0100
committerQt by Nokia <qt-info@nokia.com>2012-05-29 11:35:21 +0200
commit2c49ea852f7893faae59bbdb59e2806002f0a017 (patch)
tree215abada3efeaf7a5d2137f87c5bc1ac5009bf34 /src/corelib/doc/src
parentdd3e4f1dbe868a8524ac199af838bb5f48d8bb9d (diff)
QtCore: remove \link usages
Change-Id: I0de764b51a972de0b6eb2bf3c04d2b190f581f52 Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
Diffstat (limited to 'src/corelib/doc/src')
-rw-r--r--src/corelib/doc/src/external-resources.qdoc42
-rw-r--r--src/corelib/doc/src/objectmodel/objecttrees.qdoc4
-rw-r--r--src/corelib/doc/src/objectmodel/signalsandslots.qdoc6
-rw-r--r--src/corelib/doc/src/resource-system.qdoc2
-rw-r--r--src/corelib/doc/src/threads.qdoc3
5 files changed, 49 insertions, 8 deletions
diff --git a/src/corelib/doc/src/external-resources.qdoc b/src/corelib/doc/src/external-resources.qdoc
new file mode 100644
index 0000000000..0d1b0c3fc4
--- /dev/null
+++ b/src/corelib/doc/src/external-resources.qdoc
@@ -0,0 +1,42 @@
+/****************************************************************************
+**
+** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
+**
+** This file is part of the documentation of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:FDL$
+** GNU Free Documentation License
+** Alternatively, this file may be used under the terms of the GNU Free
+** Documentation License version 1.3 as published by the Free Software
+** Foundation and appearing in the file included in the packaging of
+** this file.
+**
+** Other Usage
+** Alternatively, this file may be used in accordance with the terms
+** and conditions contained in a signed written agreement between you
+** and Nokia.
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+
+/*!
+ \externalpage http://www.y-adagio.com/public/standards/tr_xml_jpf/toc.htm
+ \title XML Japanese Profile
+*/
+
+/*!
+ \externalpage http://www.geocities.com/Athens/5180/tsciiset.html
+ \title http://www.geocities.com/Athens/5180/tsciiset.html
+*/
+
+/*!
+ \externalpage http://www.tamil.net/tscii/
+ \title http://www.tamil.net/tscii/
+*/
diff --git a/src/corelib/doc/src/objectmodel/objecttrees.qdoc b/src/corelib/doc/src/objectmodel/objecttrees.qdoc
index e03a93ab3d..298c1b6f5d 100644
--- a/src/corelib/doc/src/objectmodel/objecttrees.qdoc
+++ b/src/corelib/doc/src/objectmodel/objecttrees.qdoc
@@ -34,9 +34,9 @@
\section1 Overview
- \link QObject QObjects\endlink organize themselves in object trees.
+ \l{QObject}{QObjects} organize themselves in object trees.
When you create a QObject with another object as parent, it's added to
- the parent's \link QObject::children() children() \endlink list, and
+ the parent's \l{QObject::children()}{children()} list, and
is deleted when the parent is. It turns out that this approach fits
the needs of GUI objects very well. For example, a \l QShortcut
(keyboard shortcut) is a child of the relevant window, so when the
diff --git a/src/corelib/doc/src/objectmodel/signalsandslots.qdoc b/src/corelib/doc/src/objectmodel/signalsandslots.qdoc
index 0f12c9c8f2..c3a7183e62 100644
--- a/src/corelib/doc/src/objectmodel/signalsandslots.qdoc
+++ b/src/corelib/doc/src/objectmodel/signalsandslots.qdoc
@@ -272,9 +272,9 @@
and slot members, as well as pointers to these functions.
The meta-object contains additional information such as the
- object's \link QObject::className() class name\endlink. You can
- also check if an object \link QObject::inherits()
- inherits\endlink a specific class, for example:
+ object's \l{QObject::className()}{class name}. You can
+ also check if an object \l{QObject::inherits()}{inherits}
+ a specific class, for example:
\snippet signalsandslots/signalsandslots.cpp 5
\snippet signalsandslots/signalsandslots.cpp 6
diff --git a/src/corelib/doc/src/resource-system.qdoc b/src/corelib/doc/src/resource-system.qdoc
index 89a099a1c1..87d98edff0 100644
--- a/src/corelib/doc/src/resource-system.qdoc
+++ b/src/corelib/doc/src/resource-system.qdoc
@@ -69,7 +69,7 @@
By default, resources are accessible in the application under the
same file name as they have in the source tree, with a \c :/ prefix,
- or by a \link QUrl URL\endlink with a \c qrc scheme.
+ or by a \l{QUrl}{URL} with a \c qrc scheme.
For example, the file path \c :/images/cut.png or the URL
\c qrc:///images/cut.png would give access to the
diff --git a/src/corelib/doc/src/threads.qdoc b/src/corelib/doc/src/threads.qdoc
index 80c9445f6f..12d78e7bbe 100644
--- a/src/corelib/doc/src/threads.qdoc
+++ b/src/corelib/doc/src/threads.qdoc
@@ -659,8 +659,7 @@
\section1 Threads and Rich Text Processing
- The QTextDocument, QTextCursor, and \link richtext.html all
- related classes\endlink are reentrant.
+ The QTextDocument, QTextCursor, and \l{richtext.html}{all related classes} are reentrant.
Note that a QTextDocument instance created in the GUI thread may
contain QPixmap image resources. Use QTextDocument::clone() to