From eff7a6473c1fe019c0906887dd723c0bc00dd6f7 Mon Sep 17 00:00:00 2001 From: Sergio Ahumada Date: Fri, 13 Feb 2015 14:56:43 +0100 Subject: [PATCH] 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 --- .../qdoc/doc/qdoc-manual-contextcmds.qdoc | 4 ++-- .../qdoc/doc/qdoc-manual-markupcmds.qdoc | 24 +++++++++---------- src/tools/qdoc/doc/qdoc-manual-qdocconf.qdoc | 4 ++-- src/tools/qdoc/doc/qdoc-manual-topiccmds.qdoc | 24 +++++++++---------- src/tools/qdoc/doc/qtgui-qdocconf.qdoc | 4 ++-- 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

- Joining + Joining QChar::joining () const

\endraw @@ -787,7 +787,7 @@ \quotation \raw HTML -

QAction +

QAction * QMenu::addAction ( const QIcon & icon, const QString & text )

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 @@ - + Signals and Slots Signals and slots are used for communication @@ -2327,7 +2327,7 @@ - + Layout Management The Qt layout system provides a simple and powerful way of specifying the layout @@ -2336,7 +2336,7 @@ - + Drag and Drop Drag and drop provides a simple visual mechanism which users can use to transfer @@ -2437,7 +2437,7 @@ - + Signals and Slots Signals and slots are used for communication @@ -2499,7 +2499,7 @@ - + Signals and Slots Signals and slots are used for communication @@ -2508,7 +2508,7 @@ - + Layout Management The Qt layout system provides a simple and powerful way of specifying the layout @@ -2517,7 +2517,7 @@ - + Drag and Drop Drag and drop provides a simple visual mechanism which users can use to transfer @@ -2935,7 +2935,7 @@ \quotation \raw HTML

geometry : - QRect + QRect

\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 @@
- QAbstractSocket + QAbstractSocket The base functionality common to all socket types @@ -551,7 +551,7 @@
- QBuffer + QBuffer QIODevice interface for a QByteArray @@ -559,7 +559,7 @@
- QClipboard + QClipboard Access to the window system clipboard @@ -635,7 +635,7 @@

Functions

  • RandomAccessIterator - qBinaryFind + qBinaryFind (RandomAccessIterator begin, RandomAccessIterator end, const T & value)
  • ...
@@ -804,7 +804,7 @@
- QAbstractSocket + QAbstractSocket The base functionality common to all socket types @@ -1539,7 +1539,7 @@ \quotation \raw HTML

- + QPalette 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.