qdoc: Fix some old links and references to Nokia

Change-Id: I06535a7e301c3986fb104b7092934e8925bacd39
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
Reviewed-by: hjk <qthjk@ovi.com>
This commit is contained in:
Sergio Ahumada 2012-12-23 17:05:03 +01:00 committed by The Qt Project
parent c40a1f6b2f
commit ef838063b1

View File

@ -128,7 +128,7 @@
\endcode
From the qdoc comment above, QDoc generates the now famous HTML
page \l {http://doc.qt.nokia.com/qobject.html#details}
page \l {http://qt-project.org/doc/qt-5.0/qtcore/qobject.html#details}
{QObject Class Reference}.
This manual explains how to use the QDoc commands in qdoc comments
@ -1744,10 +1744,10 @@
\printuntil hello
First we create a \l
{http://qt.nokia.com/doc/4.0/qapplication} {QApplication}
{http://qt-project.org/doc/qt-5.0/qtwidgets/qapplication.html} {QApplication}
object using the \c argc and \c argv parameters, then we
create a \l
{http://qt.nokia.com/doc/4.0/qpushbutton} {QPushButton}.
{http://qt-project.org/doc/qt-5.0/qtwidgets/qpushbutton.html} {QPushButton}.
\endquotation
(\l {Example File} {The complete example file...})
@ -2060,16 +2060,16 @@
\code
/ *!
Read the \l {http://qt.nokia.com/doc/4.0/}
{Qt's Reference Documentation} carefully.
Read the \l {http://qt-project.org/doc/qt-5.0/}
{Qt 5.0 Documentation} carefully.
* /
\endcode
QDoc renders this as:
\quotation
Read the \l {http://qt.nokia.com/doc/4.0/}
{Qt's Reference Documentation} carefully.
Read the \l {http://qt-project.org/doc/qt-5.0/}
{Qt 5.0 Documentation} carefully.
\endquotation
If the link target is equivalent to the link text, the second
@ -2142,7 +2142,7 @@
\li \c {\l network.html} - The file name used in a \l
{page-command} {\\page} command.
\li \c {\l http://qt.nokia.com/} - A URL.
\li \c {\l http://qt-project.org/} - A URL.
\endlist
@ -2271,7 +2271,7 @@
From other documents, the target name can be linked this way:
\list
\li \c {\l http://doc.qt.nokia.com/4.0/qregexp.html#capturing-parentheses}
\li \c {\l http://qt-project.org/doc/qt-5.0/qtcore/qregexp.html#capturing-parentheses}
\endlist
See also \l {l-command} {\\l}, \l {sa-command} {\\sa} and \l
@ -2610,7 +2610,7 @@
<tr valign="top" bgcolor="#d0d0d0">
<td>
<a href="http://qt.nokia.com/doc/4.0/signalsandslots.html">
<a href="http://qt-project.org/doc/qt-5.0/qtcore/signalsandslots.html">
Signals and Slots</a>
</td>
<td>Signals and slots are used for communication
@ -2619,7 +2619,7 @@
<tr valign="top" bgcolor="#c0c0c0">
<td>
<a href=http://qt.nokia.com/doc/4.0/layout.html">
<a href="http://qt-project.org/doc/qt-5.0/qtwidgets/layout.html">
Layout Management</a></td>
<td>The Qt layout system provides a simple
and powerful way of specifying the layout
@ -2628,7 +2628,7 @@
<tr valign="top" bgcolor="#d0d0d0">
<td>
<a href=http://qt.nokia.com/doc/4.0/dnd.html">
<a href="http://qt-project.org/doc/qt-5.0/qtgui/dnd.html">
Drag and Drop</a></td>
<td>Drag and drop provides a simple visual
mechanism which users can use to transfer
@ -2729,7 +2729,7 @@
<tr valign="top" bgcolor="#d0d0d0">
<td>
<a href="http://qt.nokia.com/doc/4.0/signalsandslots.html">
<a href="http://qt-project.org/doc/qt-5.0/qtcore/signalsandslots.html">
Signals and Slots</a>
</td>
<td>Signals and slots are used for communication
@ -2791,7 +2791,7 @@
<tr valign="top" bgcolor="#d0d0d0">
<td>
<a href="http://qt.nokia.com/doc/4.0/signalsandslots.html">
<a href="http://qt-project.org/doc/qt-5.0/qtcore/signalsandslots.html">
Signals and Slots</a>
</td>
<td>Signals and slots are used for communication
@ -2800,7 +2800,7 @@
<tr valign="top" bgcolor="#c0c0c0">
<td>
<a href=http://qt.nokia.com/doc/4.0/layout.html">
<a href="http://qt-project.org/doc/qt-5.0/qtwidgets/layout.html">
Layout Management</a></td>
<td>The Qt layout system provides a simple
and powerful way of specifying the layout
@ -2809,7 +2809,7 @@
<tr valign="top" bgcolor="#d0d0d0">
<td>
<a href=http://qt.nokia.com/doc/4.0/dnd.html">
<a href="http://qt-project.org/doc/qt-5.0/qtgui/dnd.html">
Drag and Drop</a></td>
<td>Drag and drop provides a simple visual
mechanism which users can use to transfer
@ -3213,7 +3213,7 @@
\quotation
\raw HTML
<h3>geometry :
<a href="http://qt.nokia.com/doc/4.0/qrect.html">QRect</a>
<a href="http://qt-project.org/doc/qt-5.0/qtcore/qrect.html">QRect</a>
</h3>
\endraw
@ -3704,11 +3704,11 @@
\l{GNU Lesser General Public License (LGPL)} or the
\l{Qt Commercial Edition}{Qt Commercial License Agreement}, but rather under
specific licenses from the original authors. Some pieces of code were developed
by Nokia and others originated from third parties.
by Digia and others originated from third parties.
This page lists the licenses used, names the authors, and links
to the places where it is used.
Nokia gratefully acknowledges these and other contributions
Digia gratefully acknowledges these and other contributions
to Qt. We recommend that programs that use Qt also acknowledge
these contributions, and quote these license statements in an
appendix to the documentation.
@ -4642,11 +4642,11 @@
Files:
\list
\li \l{http://qt.nokia.com/doc/4.0/widgets-imageviewer-imageviewer-cpp.html}
\li \l{http://qt-project.org/doc/qt-5.0/qtwidgets/widgets-imageviewer-imageviewer-cpp.html}
{widgets/imageviewer/imageviewer.cpp}
\li \l{http://qt.nokia.com/doc/4.0/widgets-imageviewer-imageviewer-h.html}
\li \l{http://qt-project.org/doc/qt-5.0/qtwidgets/widgets-imageviewer-imageviewer-h.html}
{widgets/imageviewer/imageviewer.h}
\li \l{http://qt.nokia.com/doc/4.0/widgets-imageviewer-main-cpp.html}
\li \l{http://qt-project.org/doc/qt-5.0/qtwidgets/widgets-imageviewer-main-cpp.html}
{widgets/imageviewer/main.cpp}
\endlist
@ -4663,7 +4663,7 @@
\code
/ *!
\externalpage http://doc.qt.nokia.com/index.html
\externalpage http://qt-project.org/doc/
\title Qt Documentation Site
* /
\endcode
@ -4681,7 +4681,7 @@
QDoc renders this as:
\quotation
At the \l {http://doc.qt.nokia.com/index.html}{Qt Documentation Site}
At the \l {http://qt-project.org/doc/}{Qt Documentation Site}
you can find the latest documentation for Qt, Qt Creator, the Qt SDK
and much more.
\endquotation
@ -4692,7 +4692,7 @@
\code
/ *!
At the \l {http://doc.qt.nokia.com/index.html}{Qt Documentation Site}
At the \l {http://qt-project.org/doc/}{Qt Documentation Site}
you can find the latest documentation for Qt, Qt Creator, the Qt SDK
and much more.
* /
@ -4792,7 +4792,7 @@
<table width="100%">
<tr valign="top" bgcolor="#e0e0e0">
<td><b>
<a href="http://qt.nokia.com/doc/4.0/qabstractsocket.html">QAbstractSocket</a>
<a href="http://qt-project.org/doc/qt-5.0/qtnetwork/qabstractsocket.html">QAbstractSocket</a>
</b></td>
<td>
The base functionality common to all socket types
@ -4800,7 +4800,7 @@
<tr valign="top" bgcolor="#e0e0e0">
<td><b>
<a href="http://qt.nokia.com/doc/4.0/qbuffer.html">QBuffer</a>
<a href="http://qt-project.org/doc/qt-5.0/qtcore/qbuffer.html">QBuffer</a>
</b></td>
<td>
QIODevice interface for a QByteArray
@ -4808,7 +4808,7 @@
<tr valign="top" bgcolor="#e0e0e0">
<td><b>
<a href="http://qt.nokia.com/doc/4.0/qclipboard.html">QClipboard</a>
<a href="http://qt-project.org/doc/qt-5.0/qtgui/qclipboard.html">QClipboard</a>
</b></td>
<td>
Access to the window system clipboard
@ -4884,7 +4884,7 @@
<h3>Functions</h3>
<ul>
<li>RandomAccessIterator
<a href="http://qt.nokia.com/doc/4.0/qlineedit.html#EchoMode-enum">qBinaryFind</a></b>
<a href="http://qt-project.org/doc/qt-5.0/qtcore/qtalgorithms.html#qBinaryFind">qBinaryFind</a></b>
(RandomAccessIterator begin, RandomAccessIterator end,
const T & value)</li>
<li>...</li></ul>
@ -5054,7 +5054,7 @@
<table width="100%">
<tr valign="top" bgcolor="#d0d0d0">
<td><b>
<a href="http://qt.nokia.com/doc/4.0/qabstractsocket.html">QAbstractSocket</a>
<a href="http://qt-project.org/doc/qt-5.0/qtnetwork/qabstractsocket.html">QAbstractSocket</a>
</b></td>
<td>
The base functionality common to all socket types
@ -5062,7 +5062,7 @@
<tr valign="top" bgcolor="#d0d0d0">
<td><b>
<a href="http://qt.nokia.com/doc/4.0/qftp.html">QFtp</a>
<a href="http://doc.qt.digia.com/4.0/qftp.html">QFtp</a>
</b></td>
<td>
Implementation of the FTP protocol
@ -5133,7 +5133,7 @@
<pre>#include &lt;Qt&gt;</pre>
<ul>
<li>
<a href="http://qt.nokia.com/doc/4.0/qt-qt3.html">
<a href="http://doc.qt.digia.com/4.0/qt-qt3.html">
Qt 3 support members</a></li>
</ul>
@ -5141,7 +5141,7 @@
<h3>Types</h3>
<ul>
<li>flags
<a href="http://qt.nokia.com/doc/4.0/qt.html#AlignmentFlag-enum">Alignment</a></b></li>
<a href="http://doc.qt.digia.com/4.0/qt.html#AlignmentFlag-enum">Alignment</a></b></li>
<li>...</li></ul>
<hr />
\endraw
@ -5332,7 +5332,7 @@
The \\qmlattachedproperty command is for documenting a QML
property that will be attached to some QML type. See
\l{http://doc.qt.nokia.com/4.7/qdeclarativeintroduction.html#attached-properties}
\l{http://qt-project.org/doc/qt-4.7/qdeclarativeintroduction.html#attached-properties}
{Attached Properties}. The argument is the rest of the line. The
argument text should be the property type, followed by the QML
element name where the property is being declared, the \c{::}
@ -5357,14 +5357,14 @@
\endcode
QDoc includes this attached property on the QML reference page for the
\l{http://doc.qt.nokia.com/4.7/qml-listview.html#isCurrentItem-prop}
\l{http://qt-project.org/doc/qt-4.7/qml-listview.html#isCurrentItem-prop}
{ListView} element.
\target qmlattachedsignal-command
\section1 \\qmlattachedsignal
The \\qmlattachedsignal command is for documenting an attachable
\l{http://doc.qt.nokia.com/4.7/qdeclarativeintroduction.html#signal-handlers}
\l{http://qt-project.org/doc/qt-4.7/qdeclarativeintroduction.html#signal-handlers}
{signal handler}. The \\qmlattachedsignal command is used just like
the \l{qmlsignal-command} {\\qmlsignal} command.
@ -5383,7 +5383,7 @@
\endcode
QDoc includes this documentation on the QML reference page for the
\l{http://doc.qt.nokia.com/4.7/qml-gridview.html#onAdd-signal}
\l{http://qt-project.org/doc/qt-4.7/qml-gridview.html#onAdd-signal}
{GridView} element.
\target qmlbasictype-command
@ -5394,10 +5394,10 @@
QML basic types group using the \l{ingroup-command}{\\ingroup}
command as shown below. This will cause QDoc to include the
documentation for the type on the
\l{http://doc.qt.nokia.com/4.7/qdeclarativebasictypes.html}
\l{http://qt-project.org/doc/qt-4.7/qdeclarativebasictypes.html}
{QML Basic Types} page. The \l{brief-command} {\\brief} command
is also required, because it appears on the
\l{http://doc.qt.nokia.com/4.7/qdeclarativebasictypes.html}
\l{http://qt-project.org/doc/qt-4.7/qdeclarativebasictypes.html}
{QML Basic Types} page as well.
\code
@ -5421,7 +5421,7 @@
* /
\endcode
QDoc outputs this as \l{http://doc.qt.nokia.com/4.7/qml-int.html}
QDoc outputs this as \l{http://qt-project.org/doc/qt-4.7/qml-int.html}
{qml-int.html}.
\target qmlclass-command
@ -5464,7 +5464,7 @@
\endcode
This example generates the
\l {http://doc.qt.nokia.com/4.7/qml-transform.html} {QML Transform}
\l {http://qt-project.org/doc/qt-4.7/qml-transform.html} {QML Transform}
page. The \\qmlclass comment should include the \l
{since-command} {\\since} command, because all QML types are
new. It should also include the \l{brief-command} {\\brief}
@ -5496,7 +5496,7 @@
\endcode
QDoc includes this documentation on the element refence page for the
\l{http://doc.qt.nokia.com/4.7/qml-textinput.html#select-method}
\l{http://qt-project.org/doc/qt-4.7/qml-textinput.html#select-method}
{TextInput} element.
\target qmltype-command
@ -5538,7 +5538,7 @@
\endcode
The example generates the \l
{http://doc.qt.nokia.com/4.7/qml-transform.html} {QML Transform}
{http://qt-project.org/doc/qt-4.7/qml-transform.html} {QML Transform}
page. The \e{\\qmltype} comment includes \l{instantiates-command}
{\\instantiates} to specify that a Transform is instantiated by
the C++ class QGraphicsTransform. A \\qmltype comment should
@ -5572,7 +5572,7 @@
\endcode
QDoc includes this documentation on the element refence page for the
\l{http://doc.qt.nokia.com/4.7/qml-textinput.html#select-method}
\l{http://qt-project.org/doc/qt-4.7/qml-textinput.html#select-method}
{TextInput} element.
\target qmlproperty-command
@ -5594,7 +5594,7 @@
\endcode
QDoc includes this QML property on the QML reference page for the
\l {http://doc.qt.nokia.com/4.7/qml-translate.html} {Translate}
\l {http://qt-project.org/doc/qt-4.7/qml-translate.html} {Translate}
element.
\target qmlsignal-command
@ -5616,7 +5616,7 @@
\endcode
QDoc includes this documentation on the QML reference page for the
\l{http://doc.qt.nokia.com/4.7/qml-mousearea.html#onEntered-signal}
\l{http://qt-project.org/doc/qt-4.7/qml-mousearea.html#onEntered-signal}
{MouseArea} element.
\target qmlmodule-command
@ -5694,7 +5694,7 @@
\endcode
The example generates the \l
{http://doc.qt.nokia.com/4.7/qml-transform.html} {QML Transform}
{http://qt-project.org/doc/qt-4.7/qml-transform.html} {QML Transform}
page. The \e{\\qmltype} comment includes \l{instantiates-command}
{\\instantiates} to specify that a Transform is instantiated by
the C++ class QGraphicsTransform. A \\qmltype comment should
@ -5814,7 +5814,7 @@
\quotation
\raw HTML
<h3>
<a href="http://qt.nokia.com/doc/4.0/qpalette.html">
<a href="http://qt-project.org/doc/qt-5.0/qtgui/qpalette.html">
QPalette
</a>
QStyleOption::palette
@ -6169,7 +6169,7 @@
library.} It is provided to keep old source code
working. We strongly advise against using it in new
code. See the \l
{http://qt.nokia.com/doc/4.0/porting4.html} {Porting
{http://doc.qt.digia.com/4.0/porting4.html} {Porting
Guide} for more information.
\endquotation
@ -6218,7 +6218,7 @@
\section1 \\default
The \\default command is for marking a QML property as the
\l {http://doc.qt.nokia.com/4.7/qdeclarativeintroduction.html#default-properties}
\l {http://qt-project.org/doc/qt-4.7/qdeclarativeintroduction.html#default-properties}
{default property}. The word \span {class="newStuff"} {default} is shown in red in
the documentation of the property.
@ -6235,7 +6235,7 @@
\endcode
See how QDoc renders this property on the reference page for the
\l {http://doc.qt.nokia.com/4.7/qml-state.html#changes-prop} {State}
\l {http://qt-project.org/doc/qt-4.7/qml-state.html#changes-prop} {State}
type.
\target obsolete-command
@ -6350,7 +6350,7 @@
\quotation
\raw HTML
<h3>
<a href="http://qt.nokia.com/doc/4.0/qchar.html#Joining-enum">Joining</a>
<a href="http://qt-project.org/doc/qt-5.0/qtcore/qchar.html#Joining-enum">Joining</a>
QChar::joining () const</h3>
\endraw
@ -6369,7 +6369,7 @@
\list
\li ...
\li Joining
\l {http://qt.nokia.com/doc/4.0/qchar.html#Joining-enum}
\l {http://qt-project.org/doc/qt-5.0/qtcore/qchar.html#Joining-enum}
{joining}()
const \c (preliminary)
\li ...
@ -6658,11 +6658,11 @@
\endcode
QDoc includes this line on the reference page for the
\l{http://doc.qt.nokia.com/4.7/qml-pauseanimation.html} {PauseAnimation}
\l{http://qt-project.org/doc/qt-4.7/qml-pauseanimation.html} {PauseAnimation}
element:
\quotation
Inherits \l{http://doc.qt.nokia.com/4.7/qml-animation.html} {Animation}
Inherits \l{http://qt-project.org/doc/qt-4.7/qml-animation.html} {Animation}
\endquotation
\target overload-command
@ -6707,13 +6707,13 @@
\quotation
\raw HTML
<h3><a href="http://qt.nokia.com/doc/4.0/qaction.html">QAction</a>
<h3><a href="http://qt-project.org/doc/qt-5.0/qtwidgets/qaction.html">QAction</a>
* QMenu::addAction ( const QIcon & <i>icon</i>,
const QString & <i>text</i> )
</h3>
\endraw
This function overloads \l {http://qt.nokia.com/doc/4.0/qwidget.html#addAction} {addAction()}
This function overloads \l {http://qt-project.org/doc/qt-5.0/qtwidgets/qwidget.html#addAction} {addAction()}
This convenience function creates a new action with an
\e icon and some \e text. The function adds the newly
@ -6721,7 +6721,7 @@
returns it.
See also
\l {http://qt.nokia.com/doc/4.0/qwidget.html#addAction}
\l {http://qt-project.org/doc/qt-5.0/qtwidgets/qwidget.html#addAction}
{QWidget::addAction}().
\endquotation
@ -6832,7 +6832,7 @@
list created by calling the \l {generatelist-command}
{\\generatelist} command with the \c mainclasses argument:
\l http://qt.nokia.com/doc/4.0/mainclasses.html
\l http://doc.qt.digia.com/4.0/mainclasses.html
\note The Qt documentation no longer includes the \e mainclasses
page.
@ -8450,7 +8450,7 @@
\endcode
The complete variable entry in \l qt.qdocconf provides the
standard footer of the \l {http://qt.nokia.com/doc/4.0/index.html}
standard footer of the \l {http://doc.qt.digia.com/4.0/index.html}
{Qt Reference Documentation}.
\target HTML.postheader-variable
@ -8479,7 +8479,7 @@
\endcode
The complete variable entry in \l qt.qdocconf provides the
standard header of the \l {http://doc.qt.nokia.com/}
standard header of the \l {http://doc.qt.digia.com/}
{Qt Reference Documentation}.
\target HTML.style-variable
@ -8506,7 +8506,7 @@
\endcode
provides the HTML style for the \l
{http://qt.nokia.com/doc/4.0/index.html} {Qt Reference
{http://doc.qt.digia.com/4.0/index.html} {Qt Reference
Documentation}.
\target HTML.stylesheets-variable
@ -8599,14 +8599,14 @@
\code
project = Qt
description = Qt Reference Documentation
url = http://doc.qt.nokia.com/4.7
url = http://qt-project.org/doc/qt-4.8/
...
\endcode
This makes sure that whenever \c qt.index is used to generate
references to for example Qt classes, the base URL is \c
http://doc.qt.nokia.com/4.7.
http://doc.qt.digia.com/4.7.
See also \l indexes.
@ -8622,7 +8622,7 @@
\code
project = Qt
description = Qt Reference Documentation
url = http://doc.qt.nokia.com/4.7
url = http://qt-project.org/doc/qt-4.8/
...
\endcode
@ -8641,8 +8641,8 @@
\code
project = QtCreator
description = Qt Creator Class Documentation
url = http://doc.qt.nokia.com/qtcreator-2.2
description = Qt Creator Manual
url = http://qt-project.org/doc/qtcreator-2.6/
indexes = $QTDIR/doc/html/qt.index
@ -8806,6 +8806,6 @@
*/
/*!
\externalpage http://qt.nokia.com/about
\externalpage http://qt-project.org/about
\title About Qt
*/