From 1b913793237ea7d25380ac5634ae419806f8645f Mon Sep 17 00:00:00 2001 From: Jerome Pasion Date: Tue, 30 Apr 2013 13:28:13 +0200 Subject: Doc: Copying changes to external pages from qtdoc MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit -the externalsites from qtdoc is being removed and the new copy is in qtbase/doc/global. Change-Id: I8f509acf05c0e1f399205daf4e4831cf46475746 Reviewed-by: Venugopal Shivashankar Reviewed-by: Martin Smith Reviewed-by: Topi Reiniö --- doc/global/externalsites/external-resources.qdoc | 8 ++++---- doc/global/externalsites/qch-urls.qdoc | 4 ++-- doc/global/externalsites/qt-webpages.qdoc | 15 +++++++++++++++ 3 files changed, 21 insertions(+), 6 deletions(-) diff --git a/doc/global/externalsites/external-resources.qdoc b/doc/global/externalsites/external-resources.qdoc index bc1a8d492a..4d2348619a 100644 --- a/doc/global/externalsites/external-resources.qdoc +++ b/doc/global/externalsites/external-resources.qdoc @@ -259,22 +259,22 @@ */ /*! - \externalpage http://www.amazon.com/exec/obidos/ASIN/0134436989/trolltech/t + \externalpage http://www.amazon.com/Threads-Primer-Guide-Multithreaded-Programming/dp/0134436989/ref=sr_1_1?ie=UTF8&qid=1354884049&sr=8-1&keywords=a+guide+to+multithreaded+programming \title Threads Primer: A Guide to Multithreaded Programming */ /*! - \externalpage http://www.amazon.com/exec/obidos/ASIN/0131900676/trolltech/t + \externalpage http://www.amazon.com/Thread-Time-MultiThreaded-Programming-Guide/dp/0131900676/ref=sr_1_sc_3?ie=UTF8&qid=1354884427&sr=8-3-spell&keywords=The+Mulltithread+Programming+Guide \title Thread Time: The Multithreaded Programming Guide */ /*! - \externalpage http://www.amazon.com/exec/obidos/ASIN/1565921151/trolltech/t + \externalpage http://www.amazon.com/Pthreads-Programming-Standard-Multiprocessing-Nutshell/dp/1565921151/ref=sr_1_1?s=books&ie=UTF8&qid=1354884565&sr=1-1&keywords=threads+Programming%3A+A+POSIX+Standard+for+Better+Multiprocessing \title Pthreads Programming: A POSIX Standard for Better Multiprocessing */ /*! - \externalpage http://www.amazon.com/exec/obidos/ASIN/1565922964/trolltech/t + \externalpage http://www.amazon.com/Win32-Multithreaded-Programming-Aaron-Cohen/dp/B00007GW3Z/ref=sr_1_1?s=books&ie=UTF8&qid=1354884647&sr=1-1&keywords=Win32+Multithreaded+Programming \title Win32 Multithreaded Programming */ diff --git a/doc/global/externalsites/qch-urls.qdoc b/doc/global/externalsites/qch-urls.qdoc index e099669dd6..f8ff8df7a0 100644 --- a/doc/global/externalsites/qch-urls.qdoc +++ b/doc/global/externalsites/qch-urls.qdoc @@ -38,7 +38,7 @@ \title external: Publishing Applications to Ovi Store */ /*! - \externalpage http://doc.qt.digia.com/qtcreator/index.html + \externalpage http://qt-project.org/doc/qtcreator \title external: Qt Creator Manual */ /*! @@ -90,6 +90,6 @@ \title external: Qt Mobility Examples */ /*! - \externalpage http://doc-snapshot.qt-project.org/qtcreator-2.6/creator-overview.html + \externalpage http://qt-project.org/doc/qtcreator/creator-overview.html \title external: Qt Creator Overview */ diff --git a/doc/global/externalsites/qt-webpages.qdoc b/doc/global/externalsites/qt-webpages.qdoc index c83d5e1c94..f7bb9b1b89 100644 --- a/doc/global/externalsites/qt-webpages.qdoc +++ b/doc/global/externalsites/qt-webpages.qdoc @@ -90,3 +90,18 @@ \externalpage http://qt-project.org/wiki/jom \title jom */ + +/*! + \externalpage http://qt-project.org/doc/qt-4.8 + \title Qt 4.8 Reference Documentation +*/ + +/*! + \externalpage http://qt-project.org/doc/qt-4.8/qtquick.html + \title Qt Quick 1 Reference Documentation +*/ + +/*! + \externalpage http://qt-project.org/wiki/Qt-Localization + \title external: Translating Qt Into Other Languages +*/ -- cgit v1.2.3