From fbf3daef384706cd5ddc15c48bcf0b3980eaf6a4 Mon Sep 17 00:00:00 2001 From: Topi Reinio Date: Thu, 24 Sep 2015 10:10:19 +0200 Subject: [PATCH] Doc: Update obsolete URLs to external documentation Change-Id: I199de83971701c14e903e712fcdcd29aaff95c6d Task-number: QTBUG-48420 Reviewed-by: Venugopal Shivashankar Reviewed-by: Liang Qi --- doc/global/externalsites/qt-webpages.qdoc | 8 ++++---- examples/widgets/doc/src/codeeditor.qdoc | 2 +- examples/widgets/doc/src/syntaxhighlighter.qdoc | 2 +- examples/widgets/widgets/stylesheet/mainwindow.cpp | 2 +- src/corelib/doc/src/eventsandfilters.qdoc | 2 +- src/corelib/global/qnamespace.qdoc | 2 +- src/gui/image/qpixmapcache.cpp | 2 +- src/tools/qdoc/doc/qdoc-manual-contextcmds.qdoc | 2 +- src/tools/qdoc/doc/qdoc-manual-qdocconf.qdoc | 6 +++--- src/tools/qdoc/doc/qdoc-manual-topiccmds.qdoc | 6 +++--- src/widgets/dialogs/qwizard.cpp | 2 +- src/widgets/doc/src/widgets-and-layouts/layout.qdoc | 2 +- 12 files changed, 19 insertions(+), 19 deletions(-) diff --git a/doc/global/externalsites/qt-webpages.qdoc b/doc/global/externalsites/qt-webpages.qdoc index 386573e5268..e70a4414959 100644 --- a/doc/global/externalsites/qt-webpages.qdoc +++ b/doc/global/externalsites/qt-webpages.qdoc @@ -41,11 +41,11 @@ \title Qt Licensing Overview */ /*! - \externalpage http://doc.qt.digia.com/qq/ + \externalpage http://doc.qt.io/archives/qq/ \title Qt Quarterly */ /*! - \externalpage http://doc.qt.digia.com/qq/qq19-plurals.html + \externalpage http://doc.qt.io/archives/qq/qq19-plurals.html \title Qt Quarterly: Plural Form in Translation */ /*! @@ -62,11 +62,11 @@ \title Qt Coding Style */ /*! - \externalpage http://doc.qt.digia.com/qt-eclipse-1.6/index.html + \externalpage http://doc.qt.io/archives/qt-eclipse-1.6/index.html \title Eclipse Plugin */ /*! - \externalpage http://doc.qt.digia.com/qq/qq11-events.html + \externalpage http://doc.qt.io/archives/qq/qq11-events.html \title Qt Quarterly: Another Look at Events */ /*! diff --git a/examples/widgets/doc/src/codeeditor.qdoc b/examples/widgets/doc/src/codeeditor.qdoc index 645854a58c5..6c9e5921b8e 100644 --- a/examples/widgets/doc/src/codeeditor.qdoc +++ b/examples/widgets/doc/src/codeeditor.qdoc @@ -192,6 +192,6 @@ fetched with QTextBlock::userData(). Matching parentheses can be highlighted with an extra selection. The "Matching Parentheses with QSyntaxHighlighter" article in Qt Quarterly 31 implements - this. You find it here: \l{http://doc.qt.digia.com/qq/}. + this. You find it here: \l{http://doc.qt.io/archives/qq/}. */ diff --git a/examples/widgets/doc/src/syntaxhighlighter.qdoc b/examples/widgets/doc/src/syntaxhighlighter.qdoc index 2b283afe5e1..7d33299c810 100644 --- a/examples/widgets/doc/src/syntaxhighlighter.qdoc +++ b/examples/widgets/doc/src/syntaxhighlighter.qdoc @@ -248,7 +248,7 @@ It is possible to implement parenthesis matching with QSyntaxHighlighter. The "Matching Parentheses with QSyntaxHighlighter" article in Qt Quarterly 31 - (\l{http://doc.qt.digia.com/qq/}) implements this. We also have + (\l{http://doc.qt.io/archives/qq/}) implements this. We also have the \l{Code Editor Example}, which shows how to implement line numbers and how to highlight the current line. diff --git a/examples/widgets/widgets/stylesheet/mainwindow.cpp b/examples/widgets/widgets/stylesheet/mainwindow.cpp index a49c06dfd29..6d84897c778 100644 --- a/examples/widgets/widgets/stylesheet/mainwindow.cpp +++ b/examples/widgets/widgets/stylesheet/mainwindow.cpp @@ -67,7 +67,7 @@ void MainWindow::on_aboutAction_triggered() { QMessageBox::about(this, tr("About Style sheet"), tr("The Style Sheet example shows how widgets can be styled " - "using Qt " + "using Qt " "Style Sheets. Click File|Edit Style Sheet to pop up the " "style editor, and either choose an existing style sheet or design " "your own.")); diff --git a/src/corelib/doc/src/eventsandfilters.qdoc b/src/corelib/doc/src/eventsandfilters.qdoc index a4710eb2888..99a40bb1b80 100644 --- a/src/corelib/doc/src/eventsandfilters.qdoc +++ b/src/corelib/doc/src/eventsandfilters.qdoc @@ -100,7 +100,7 @@ event delivery mechanisms are flexible. The documentation for QCoreApplication::notify() concisely tells the whole story; the \e{Qt Quarterly} article - \l{http://doc.qt.digia.com/qq/qq11-events.html}{Another Look at Events} + \l{http://doc.qt.io/archives/qq/qq11-events.html}{Another Look at Events} rehashes it less concisely. Here we will explain enough for 95% of applications. diff --git a/src/corelib/global/qnamespace.qdoc b/src/corelib/global/qnamespace.qdoc index adfa28d384e..b8ce8792cbf 100644 --- a/src/corelib/global/qnamespace.qdoc +++ b/src/corelib/global/qnamespace.qdoc @@ -2715,7 +2715,7 @@ "\l{http://bugreports.qt.io/browse/QTWEBSITE-13}{http://bugreports.qt.../QTWEBSITE-13/}"), whereas Qt::ElideRight is appropriate for other strings (e.g., - "\l{http://doc.qt.digia.com/qq/qq09-mac-deployment.html}{Deploying Applications on Ma...}"). + "\l{http://doc.qt.io/archives/qq/qq09-mac-deployment.html}{Deploying Applications on Ma...}"). \sa QAbstractItemView::textElideMode, QFontMetrics::elidedText(), AlignmentFlag, QTabBar::elideMode */ diff --git a/src/gui/image/qpixmapcache.cpp b/src/gui/image/qpixmapcache.cpp index 71a79745e85..de37e0ab447 100644 --- a/src/gui/image/qpixmapcache.cpp +++ b/src/gui/image/qpixmapcache.cpp @@ -73,7 +73,7 @@ QT_BEGIN_NAMESPACE memory. The \e{Qt Quarterly} article - \l{http://doc.qt.digia.com/qq/qq12-qpixmapcache.html}{Optimizing + \l{http://doc.qt.io/archives/qq/qq12-qpixmapcache.html}{Optimizing with QPixmapCache} explains how to use QPixmapCache to speed up applications by caching the results of painting. diff --git a/src/tools/qdoc/doc/qdoc-manual-contextcmds.qdoc b/src/tools/qdoc/doc/qdoc-manual-contextcmds.qdoc index a2e851293cd..d707c77cfb2 100644 --- a/src/tools/qdoc/doc/qdoc-manual-contextcmds.qdoc +++ b/src/tools/qdoc/doc/qdoc-manual-contextcmds.qdoc @@ -269,7 +269,7 @@ library.} It is provided to keep old source code working. We strongly advise against using it in new code. See the \l - {http://doc.qt.digia.com/4.0/porting4.html} {Porting + {http://doc.qt.io/qt-4.8/porting4.html} {Porting Guide} for more information. \endquotation diff --git a/src/tools/qdoc/doc/qdoc-manual-qdocconf.qdoc b/src/tools/qdoc/doc/qdoc-manual-qdocconf.qdoc index d490f8549a7..69980c1e18f 100644 --- a/src/tools/qdoc/doc/qdoc-manual-qdocconf.qdoc +++ b/src/tools/qdoc/doc/qdoc-manual-qdocconf.qdoc @@ -1392,8 +1392,8 @@ \endcode The complete variable entry in \l qtgui.qdocconf provides the - standard header of the \l {http://doc.qt.digia.com/} - {Qt Reference Documentation}. + standard header of the \l {http://doc.qt.io/qt-5/qtgui-index.html} + {Qt GUI Documentation}. \target HTML.style-variable \section1 HTML.style @@ -1521,7 +1521,7 @@ 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.digia.com/4.7. + http://doc.qt.io/qt-4.8/. See also \l indexes. diff --git a/src/tools/qdoc/doc/qdoc-manual-topiccmds.qdoc b/src/tools/qdoc/doc/qdoc-manual-topiccmds.qdoc index 306fc40cb85..1dfd0316330 100644 --- a/src/tools/qdoc/doc/qdoc-manual-topiccmds.qdoc +++ b/src/tools/qdoc/doc/qdoc-manual-topiccmds.qdoc @@ -812,7 +812,7 @@ - QFtp + QFtp Implementation of the FTP protocol @@ -885,7 +885,7 @@ 
#include <Qt>
@@ -893,7 +893,7 @@

Types

\endraw diff --git a/src/widgets/dialogs/qwizard.cpp b/src/widgets/dialogs/qwizard.cpp index 8b9ea95cf37..b9906f13da0 100644 --- a/src/widgets/dialogs/qwizard.cpp +++ b/src/widgets/dialogs/qwizard.cpp @@ -3662,7 +3662,7 @@ bool QWizardPage::validatePage() from the rest of your implementation, whenever the value of isComplete() changes. This ensures that QWizard updates the enabled or disabled state of its buttons. An example of the reimplementation is - available \l{http://doc.qt.digia.com/qq/qq22-qwizard.html#validatebeforeitstoolate} + available \l{http://doc.qt.io/archives/qq/qq22-qwizard.html#validatebeforeitstoolate} {here}. \sa completeChanged(), isFinalPage() diff --git a/src/widgets/doc/src/widgets-and-layouts/layout.qdoc b/src/widgets/doc/src/widgets-and-layouts/layout.qdoc index 60281ce1091..47c2a17e7e3 100644 --- a/src/widgets/doc/src/widgets-and-layouts/layout.qdoc +++ b/src/widgets/doc/src/widgets-and-layouts/layout.qdoc @@ -249,7 +249,7 @@ For further guidance when implementing these functions, see the \e{Qt Quarterly} article - \l{http://doc.qt.digia.com/qq/qq04-height-for-width.html} + \l{http://doc.qt.io/archives/qq/qq04-height-for-width.html} {Trading Height for Width}.