summaryrefslogtreecommitdiffstats
path: root/src/tools
diff options
context:
space:
mode:
authorSergio Ahumada <sahumada@blackberry.com>2015-02-13 14:56:43 +0100
committerSergio Ahumada <sahumada@texla.cl>2015-02-14 06:54:33 +0000
commiteff7a6473c1fe019c0906887dd723c0bc00dd6f7 (patch)
treea471f6c18e6357c7903ca6694803069717dffb80 /src/tools
parent2e1eb051e2e6f60a936752bf9122f1d6242be4d6 (diff)
qdoc: Replace qt-project.org/doc with doc.qt.io
also update some broken links while we are at it ... Change-Id: I9707a01b01be82e229c8f135c9ae093d73fd1204 Reviewed-by: Martin Smith <martin.smith@digia.com>
Diffstat (limited to 'src/tools')
-rw-r--r--src/tools/qdoc/doc/qdoc-manual-contextcmds.qdoc4
-rw-r--r--src/tools/qdoc/doc/qdoc-manual-markupcmds.qdoc24
-rw-r--r--src/tools/qdoc/doc/qdoc-manual-qdocconf.qdoc4
-rw-r--r--src/tools/qdoc/doc/qdoc-manual-topiccmds.qdoc24
-rw-r--r--src/tools/qdoc/doc/qtgui-qdocconf.qdoc4
5 files changed, 30 insertions, 30 deletions
diff --git a/src/tools/qdoc/doc/qdoc-manual-contextcmds.qdoc b/src/tools/qdoc/doc/qdoc-manual-contextcmds.qdoc
index 9f5ef59e94..f54254e356 100644
--- a/src/tools/qdoc/doc/qdoc-manual-contextcmds.qdoc
+++ b/src/tools/qdoc/doc/qdoc-manual-contextcmds.qdoc
@@ -428,7 +428,7 @@
\quotation
\raw HTML
<h3>
- <a href="http://qt-project.org/doc/qt-5.0/qtcore/qchar.html#Joining-enum">Joining</a>
+ <a href="http://doc.qt.io/qt-5/qchar.html#JoiningType-enum">Joining</a>
QChar::joining () const</h3>
\endraw
@@ -787,7 +787,7 @@
\quotation
\raw HTML
- <h3><a href="http://qt-project.org/doc/qt-5.0/qtwidgets/qaction.html">QAction</a>
+ <h3><a href="http://doc.qt.io/qt-5/qaction.html">QAction</a>
* QMenu::addAction ( const QIcon & <i>icon</i>,
const QString & <i>text</i> )
</h3>
diff --git a/src/tools/qdoc/doc/qdoc-manual-markupcmds.qdoc b/src/tools/qdoc/doc/qdoc-manual-markupcmds.qdoc
index 7825fc3a91..9f719ec3bc 100644
--- a/src/tools/qdoc/doc/qdoc-manual-markupcmds.qdoc
+++ b/src/tools/qdoc/doc/qdoc-manual-markupcmds.qdoc
@@ -1479,10 +1479,10 @@
\printuntil hello
First we create a \l
- {http://qt-project.org/doc/qt-5.0/qtwidgets/qapplication.html} {QApplication}
+ {http://doc.qt.io/qt-5/qapplication.html} {QApplication}
object using the \c argc and \c argv parameters, then we
create a \l
- {http://qt-project.org/doc/qt-5.0/qtwidgets/qpushbutton.html} {QPushButton}.
+ {http://doc.qt.io/qt-5/qpushbutton.html} {QPushButton}.
\endquotation
See also \l {printline-command} {\\printline} and \l
@@ -1776,7 +1776,7 @@
\code
/ *!
- Read the \l {http://qt-project.org/doc/qt-5.0/}
+ Read the \l {http://doc.qt.io/qt-5/}
{Qt 5.0 Documentation} carefully.
* /
\endcode
@@ -1784,7 +1784,7 @@
QDoc renders this as:
\quotation
- Read the \l {http://qt-project.org/doc/qt-5.0/}
+ Read the \l {http://doc.qt.io/qt-5/}
{Qt 5.0 Documentation} carefully.
\endquotation
@@ -2318,7 +2318,7 @@
<tr valign="top" bgcolor="#d0d0d0">
<td>
- <a href="http://qt-project.org/doc/qt-5.0/qtcore/signalsandslots.html">
+ <a href="http://doc.qt.io/qt-5/signalsandslots.html">
Signals and Slots</a>
</td>
<td>Signals and slots are used for communication
@@ -2327,7 +2327,7 @@
<tr valign="top" bgcolor="#c0c0c0">
<td>
- <a href="http://qt-project.org/doc/qt-5.0/qtwidgets/layout.html">
+ <a href="http://doc.qt.io/qt-5/layout.html">
Layout Management</a></td>
<td>The Qt layout system provides a simple
and powerful way of specifying the layout
@@ -2336,7 +2336,7 @@
<tr valign="top" bgcolor="#d0d0d0">
<td>
- <a href="http://qt-project.org/doc/qt-5.0/qtgui/dnd.html">
+ <a href="http://doc.qt.io/qt-5/dnd.html">
Drag and Drop</a></td>
<td>Drag and drop provides a simple visual
mechanism which users can use to transfer
@@ -2437,7 +2437,7 @@
<tr valign="top" bgcolor="#d0d0d0">
<td>
- <a href="http://qt-project.org/doc/qt-5.0/qtcore/signalsandslots.html">
+ <a href="http://doc.qt.io/qt-5/signalsandslots.html">
Signals and Slots</a>
</td>
<td>Signals and slots are used for communication
@@ -2499,7 +2499,7 @@
<tr valign="top" bgcolor="#d0d0d0">
<td>
- <a href="http://qt-project.org/doc/qt-5.0/qtcore/signalsandslots.html">
+ <a href="http://doc.qt.io/qt-5/signalsandslots.html">
Signals and Slots</a>
</td>
<td>Signals and slots are used for communication
@@ -2508,7 +2508,7 @@
<tr valign="top" bgcolor="#c0c0c0">
<td>
- <a href="http://qt-project.org/doc/qt-5.0/qtwidgets/layout.html">
+ <a href="http://doc.qt.io/qt-5/layout.html">
Layout Management</a></td>
<td>The Qt layout system provides a simple
and powerful way of specifying the layout
@@ -2517,7 +2517,7 @@
<tr valign="top" bgcolor="#d0d0d0">
<td>
- <a href="http://qt-project.org/doc/qt-5.0/qtgui/dnd.html">
+ <a href="http://doc.qt.io/qt-5/dnd.html">
Drag and Drop</a></td>
<td>Drag and drop provides a simple visual
mechanism which users can use to transfer
@@ -2935,7 +2935,7 @@
\quotation
\raw HTML
<h3>geometry :
- <a href="http://qt-project.org/doc/qt-5.0/qtcore/qrect.html">QRect</a>
+ <a href="http://doc.qt.io/qt-5/qrect.html">QRect</a>
</h3>
\endraw
diff --git a/src/tools/qdoc/doc/qdoc-manual-qdocconf.qdoc b/src/tools/qdoc/doc/qdoc-manual-qdocconf.qdoc
index cf1f7b2426..6ca394a586 100644
--- a/src/tools/qdoc/doc/qdoc-manual-qdocconf.qdoc
+++ b/src/tools/qdoc/doc/qdoc-manual-qdocconf.qdoc
@@ -1410,7 +1410,7 @@
\code
project = Qt
description = Qt Reference Documentation
- url = http://qt-project.org/doc/qt-4.8/
+ url = http://doc.qt.io/qt-4.8/
...
\endcode
@@ -1433,7 +1433,7 @@
\code
project = Qt
description = Qt Reference Documentation
- url = http://qt-project.org/doc/qt-4.8/
+ url = http://doc.qt.io/qt-4.8/
...
\endcode
diff --git a/src/tools/qdoc/doc/qdoc-manual-topiccmds.qdoc b/src/tools/qdoc/doc/qdoc-manual-topiccmds.qdoc
index 1d78eff386..fb3e604396 100644
--- a/src/tools/qdoc/doc/qdoc-manual-topiccmds.qdoc
+++ b/src/tools/qdoc/doc/qdoc-manual-topiccmds.qdoc
@@ -393,11 +393,11 @@
Files:
\list
- \li \l{http://qt-project.org/doc/qt-5.0/qtwidgets/widgets-imageviewer-imageviewer-cpp.html}
+ \li \l{http://doc.qt.io/qt-5/qtwidgets-widgets-imageviewer-imageviewer-cpp.html}
{widgets/imageviewer/imageviewer.cpp}
- \li \l{http://qt-project.org/doc/qt-5.0/qtwidgets/widgets-imageviewer-imageviewer-h.html}
+ \li \l{http://doc.qt.io/qt-5/qtwidgets-widgets-imageviewer-imageviewer-h.html}
{widgets/imageviewer/imageviewer.h}
- \li \l{http://qt-project.org/doc/qt-5.0/qtwidgets/widgets-imageviewer-main-cpp.html}
+ \li \l{http://doc.qt.io/qt-5/qtwidgets-widgets-imageviewer-main-cpp.html}
{widgets/imageviewer/main.cpp}
\endlist
@@ -414,7 +414,7 @@
\code
/ *!
- \externalpage http://qt-project.org/doc/
+ \externalpage http://doc.qt.io/
\title Qt Documentation Site
* /
\endcode
@@ -432,7 +432,7 @@
QDoc renders this as:
\quotation
- At the \l {http://qt-project.org/doc/}{Qt Documentation Site}
+ At the \l {http://doc.qt.io/}{Qt Documentation Site}
you can find the latest documentation for Qt, Qt Creator, the Qt SDK
and much more.
\endquotation
@@ -443,7 +443,7 @@
\code
/ *!
- At the \l {http://qt-project.org/doc/}{Qt Documentation Site}
+ At the \l {http://doc.qt.io/}{Qt Documentation Site}
you can find the latest documentation for Qt, Qt Creator, the Qt SDK
and much more.
* /
@@ -543,7 +543,7 @@
<table width="100%">
<tr valign="top" bgcolor="#e0e0e0">
<td><b>
- <a href="http://qt-project.org/doc/qt-5.0/qtnetwork/qabstractsocket.html">QAbstractSocket</a>
+ <a href="http://doc.qt.io/qt-5/qabstractsocket.html">QAbstractSocket</a>
</b></td>
<td>
The base functionality common to all socket types
@@ -551,7 +551,7 @@
<tr valign="top" bgcolor="#e0e0e0">
<td><b>
- <a href="http://qt-project.org/doc/qt-5.0/qtcore/qbuffer.html">QBuffer</a>
+ <a href="http://doc.qt.io/qt-5/qbuffer.html">QBuffer</a>
</b></td>
<td>
QIODevice interface for a QByteArray
@@ -559,7 +559,7 @@
<tr valign="top" bgcolor="#e0e0e0">
<td><b>
- <a href="http://qt-project.org/doc/qt-5.0/qtgui/qclipboard.html">QClipboard</a>
+ <a href="http://doc.qt.io/qt-5/qclipboard.html">QClipboard</a>
</b></td>
<td>
Access to the window system clipboard
@@ -635,7 +635,7 @@
<h3>Functions</h3>
<ul>
<li>RandomAccessIterator
- <a href="http://qt-project.org/doc/qt-5.0/qtcore/qtalgorithms.html#qBinaryFind">qBinaryFind</a></b>
+ <a href="http://doc.qt.io/qt-5/qtalgorithms-obsolete.html#qBinaryFind">qBinaryFind</a></b>
(RandomAccessIterator begin, RandomAccessIterator end,
const T & value)</li>
<li>...</li></ul>
@@ -804,7 +804,7 @@
<table width="100%">
<tr valign="top" bgcolor="#d0d0d0">
<td><b>
- <a href="http://qt-project.org/doc/qt-5.0/qtnetwork/qabstractsocket.html">QAbstractSocket</a>
+ <a href="http://doc.qt.io/qt-5/qabstractsocket.html">QAbstractSocket</a>
</b></td>
<td>
The base functionality common to all socket types
@@ -1539,7 +1539,7 @@
\quotation
\raw HTML
<h3>
- <a href="http://qt-project.org/doc/qt-5.0/qtgui/qpalette.html">
+ <a href="http://doc.qt.io/qt-5/qpalette.html">
QPalette
</a>
QStyleOption::palette
diff --git a/src/tools/qdoc/doc/qtgui-qdocconf.qdoc b/src/tools/qdoc/doc/qtgui-qdocconf.qdoc
index 2679b42ef2..f8213271c6 100644
--- a/src/tools/qdoc/doc/qtgui-qdocconf.qdoc
+++ b/src/tools/qdoc/doc/qtgui-qdocconf.qdoc
@@ -43,7 +43,7 @@ every statement in the qdocconf file.
project = QtGui
description = Qt GUI Reference Documentation
- url = http://qt-project.org/doc/qt-$QT_VER/qtgui
+ url = http://doc.qt.io/qt-$QT_VER/qtgui-index.html
version = $QT_VERSION
examplesinstallpath = gui
@@ -125,7 +125,7 @@ name of the index file doesn't adopt the uppercase letters of the project name.
A short description of the project concerned.
\code
- url = http://qt-project.org/doc/qt-$QT_VER/qtgui
+ url = http://doc.qt.io/qt-$QT_VER/qtgui-index.html
\endcode
The \c url variable holds the base url of the project.