From 8aac15d31d0f6d552228fd46b0bb29a4e00e850c Mon Sep 17 00:00:00 2001 From: Volker Hilsheimer Date: Mon, 10 Aug 2009 17:22:13 +0200 Subject: Doc: Our webdomain has changed. --- doc/src/trolltech-webpages.qdoc | 74 +++++++++++----------- tools/qdoc3/test/assistant.qdocconf | 2 +- .../test/carbide-eclipse-integration.qdocconf | 2 +- tools/qdoc3/test/designer.qdocconf | 2 +- tools/qdoc3/test/eclipse-integration.qdocconf | 2 +- tools/qdoc3/test/jambi.qdocconf | 2 +- tools/qdoc3/test/linguist.qdocconf | 2 +- tools/qdoc3/test/qmake.qdocconf | 2 +- tools/qdoc3/test/qt-build-docs.qdocconf | 2 +- tools/qdoc3/test/qt-html-templates.qdocconf | 2 +- tools/qdoc3/test/qt-inc.qdocconf | 6 +- tools/qdoc3/test/qt.qdocconf | 2 +- .../test/standalone-eclipse-integration.qdocconf | 2 +- 13 files changed, 51 insertions(+), 51 deletions(-) diff --git a/doc/src/trolltech-webpages.qdoc b/doc/src/trolltech-webpages.qdoc index 7d48167..cc6e4b8 100644 --- a/doc/src/trolltech-webpages.qdoc +++ b/doc/src/trolltech-webpages.qdoc @@ -40,137 +40,132 @@ ****************************************************************************/ /*! - \externalpage http://www.qtsoftware.com/products/qt + \externalpage http://qt.nokia.com/ \title Qt website */ /*! - \externalpage http://www.qtsoftware.com/bugreport-form + \externalpage http://qt.nokia.com/bugreport-form \title Bug Report Form */ /*! - \externalpage http://www.qtsoftware.com/products/add-on-products/add-on-products/ + \externalpage http://qt.nokia.com/products/add-on-products/add-on-products/ \title Third-Party Tools */ /*! - \externalpage http://www.qtsoftware.com/products/add-on-products + \externalpage http://qt.nokia.com/products/add-on-products \title Qt Solutions */ /*! - \externalpage http://www.qtsoftware.com/developer/documentation/books + \externalpage http://qt.nokia.com/developer/books \title Books about Qt Programming */ /*! - \externalpage http://www.qtsoftware.com/products/qt/qt3/book + \externalpage http://qt.nokia.com/developer/books/3 \title GUI Programming with Qt 3 */ /*! - \externalpage http://www.qtsoftware.com/products/qt/ + \externalpage http://qt.nokia.com/ \title Qt Homepage */ /*! - \externalpage http://www.qtsoftware.com/products/qt + \externalpage http://qt.nokia.com/about \title About Qt */ /*! - \externalpage http://www.qtsoftware.com/products/qt/indepth/vs-integration + \externalpage http://qt.nokia.com/products/developer-tools \title Visual Studio Integration */ /*! - \externalpage http://www.qtsoftware.com/products/add-on-products/catalog/4/Widgets/qtcalendarwidget/ + \externalpage http://qt.nokia.com/products/add-on-products/catalog/4/Widgets/qtcalendarwidget/ \title Calendar Widget */ /*! - \externalpage http://www.qtsoftware.com/products/add-on-products/catalog/4/Widgets/qtwizard/ + \externalpage http://qt.nokia.com/products/add-on-products/catalog/4/Widgets/qtwizard/ \title QtWizard */ /*! - \externalpage http://www.qtsoftware.com/products/add-on-products/catalog/4/Utilities/qtcorba/ + \externalpage http://qt.nokia.com/products/add-on-products/catalog/4/Utilities/qtcorba/ \title CORBA Framework */ /*! - \externalpage http://www.qtsoftware.com/products/add-on-products/catalog/4/Widgets/qtwindowlistmenu/ + \externalpage http://qt.nokia.com/products/add-on-products/catalog/4/Widgets/qtwindowlistmenu/ \title Window Menu */ /*! - \externalpage http://www.qtsoftware.com/customers/casestories + \externalpage http://qt.nokia.com/qt-in-use \title Customer Success Stories */ /*! - \externalpage http://www.qtsoftware.com/developer + \externalpage http://qt.nokia.com/developer \title Developer Zone */ /*! - \externalpage http://www.qtsoftware.com/developer/downloads + \externalpage http://qt.nokia.com/downloads \title Downloads */ /*! - \externalpage http://www.qtsoftware.com/developer/faqs/ + \externalpage http://qt.nokia.com/developer/faqs/ \title FAQs */ /*! - \externalpage http://www.qtsoftware.com/developer/faqs/licensing + \externalpage http://qt.nokia.com/developer/faqs/licensing \title License FAQ */ /*! - \externalpage http://www.qtsoftware.com/developer/downloads/freesoftware + \externalpage http://qt.nokia.com/products/licensing \title Free Software and Contributions */ /*! - \externalpage http://www.qtsoftware.com/products/qt/licenses/licensing/ + \externalpage http://qt.nokia.com/products/licensing \title Qt Licensing Overview */ /*! - \externalpage http://www.qtsoftware.com/products/qt/licenses/pricing/ + \externalpage http://qt.nokia.com/products/pricing/ \title Qt License Pricing */ /*! - \externalpage http://www.qtsoftware.com/products/qt/orderform + \externalpage http://qt.nokia.com/contact \title How to Order */ /*! - \externalpage http://www.qtsoftware.com/support-services/support/platform-support-policy + \externalpage http://doc.trolltech.com/supported-platforms.html \title Platform Support Policy */ /*! - \externalpage http://www.qtsoftware.com/products/ + \externalpage http://qt.nokia.com/products/ \title Product Overview */ /*! - \externalpage http://www.qtsoftware.com/developer/supported-platforms/supported-platforms/ + \externalpage http://doc.trolltech.com/supported-platforms.html \title Qt 4 Platforms Overview */ /*! - \externalpage http://www.qtsoftware.com/developer/supported-platforms/supported-platforms/ - \title Qt 4 Supported Platforms -*/ - -/*! - \externalpage http://www.qtsoftware.com/products/qtopia/ + \externalpage http://qt.nokia.com/products/qtopia/ \title Qt Extended */ @@ -180,7 +175,7 @@ */ /*! - \externalpage http://www.qtsoftware.com/developer/task-tracker + \externalpage http://qt.nokia.com/developer/task-tracker \title Task Tracker */ @@ -190,7 +185,7 @@ */ /*! - \externalpage http://www.qtsoftware.com/products/qt/learnmore/whitepapers + \externalpage http://qt.nokia.com/products/files/pdf/ \title Whitepapers */ @@ -220,12 +215,12 @@ */ /*! - \externalpage http://www.qtsoftware.com/developer/downloads/qt/qsa + \externalpage http://qt.nokia.com/products/library/modular-class-library#info_scripting \title Qt Script for Applications (QSA) */ /*! - \externalpage http://www.qtsoftware.com/products/add-on-products/catalog/4/Utilities/qtsharedmemory/ + \externalpage http://qt.nokia.com/products/add-on-products/catalog/4/Utilities/qtsharedmemory/ \title QtSharedMemory */ @@ -235,11 +230,16 @@ */ /*! - \externalpage http://www.qtsoftware.com/products/add-on-products/catalog/4/Windows/qtwinforms/ + \externalpage http://qt.nokia.com/products/add-on-products/catalog/4/Windows/qtwinforms/ \title QtWinForms Solution */ /*! - \externalpage http://www.qtsoftware.com/developer/faqs/qt/installation + \externalpage http://qt.nokia.com/developer/faqs/qt/installation \title Installation FAQ */ + +/*! + \externalpage http://qt.gitorious.org + \title Public Qt Repository +*/ diff --git a/tools/qdoc3/test/assistant.qdocconf b/tools/qdoc3/test/assistant.qdocconf index 71de998..0a4cef8 100644 --- a/tools/qdoc3/test/assistant.qdocconf +++ b/tools/qdoc3/test/assistant.qdocconf @@ -6,7 +6,7 @@ include(qt-defines.qdocconf) project = Qt Assistant description = Qt Assistant Manual -url = http://doc.qtsoftware.com/4.5 +url = http://qt.nokia.com/doc/4.5 indexes = $QT_BUILD_TREE/doc-build/html-qt/qt.index diff --git a/tools/qdoc3/test/carbide-eclipse-integration.qdocconf b/tools/qdoc3/test/carbide-eclipse-integration.qdocconf index aee5e17..faac174 100644 --- a/tools/qdoc3/test/carbide-eclipse-integration.qdocconf +++ b/tools/qdoc3/test/carbide-eclipse-integration.qdocconf @@ -7,6 +7,6 @@ macro.TheEclipseIntegration = Carbide.c++ HTML.footer = "

\n" \ "\n" \ "\n" \ - "\n" \ + "\n" \ "\n" \ "
Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)TrademarksTrademarks
Carbide.c++
" diff --git a/tools/qdoc3/test/designer.qdocconf b/tools/qdoc3/test/designer.qdocconf index 0c39bb8..acae047 100644 --- a/tools/qdoc3/test/designer.qdocconf +++ b/tools/qdoc3/test/designer.qdocconf @@ -6,7 +6,7 @@ include(qt-defines.qdocconf) project = Qt Designer description = Qt Designer Manual -url = http://doc.qtsoftware.com/4.5 +url = http://qt.nokia.com/doc/4.5 indexes = $QT_BUILD_TREE/doc-build/html-qt/qt.index diff --git a/tools/qdoc3/test/eclipse-integration.qdocconf b/tools/qdoc3/test/eclipse-integration.qdocconf index d9e4ac7..aadaae6 100644 --- a/tools/qdoc3/test/eclipse-integration.qdocconf +++ b/tools/qdoc3/test/eclipse-integration.qdocconf @@ -8,6 +8,6 @@ outputdir = $QTDIR/../qteclipsetools/main/doc/html project = Qt Eclipse Integration description = "Qt Eclipse Integration" -url = http://doc.qtsoftware.com/qt-eclipse-1.5 +url = http://qt.nokia.com/doc/qt-eclipse-1.5 HTML.{postheader,address} = "" diff --git a/tools/qdoc3/test/jambi.qdocconf b/tools/qdoc3/test/jambi.qdocconf index 101b33a..d000669 100644 --- a/tools/qdoc3/test/jambi.qdocconf +++ b/tools/qdoc3/test/jambi.qdocconf @@ -3,7 +3,7 @@ include(macros.qdocconf) project = Qt Jambi description = Qt Jambi Reference Documentation -url = http://doc.qtsoftware.com/qtjambi +url = http://qt.nokia.com/doc/qtjambi version = 4.4.0_01 diff --git a/tools/qdoc3/test/linguist.qdocconf b/tools/qdoc3/test/linguist.qdocconf index b6bd375..39d614b 100644 --- a/tools/qdoc3/test/linguist.qdocconf +++ b/tools/qdoc3/test/linguist.qdocconf @@ -6,7 +6,7 @@ include(qt-defines.qdocconf) project = Qt Linguist description = Qt Linguist Manual -url = http://doc.qtsoftware.com/4.5 +url = http://qt.nokia.com/doc/4.5 indexes = $QT_BUILD_TREE/doc-build/html-qt/qt.index diff --git a/tools/qdoc3/test/qmake.qdocconf b/tools/qdoc3/test/qmake.qdocconf index 83220ae..91b0b1b 100644 --- a/tools/qdoc3/test/qmake.qdocconf +++ b/tools/qdoc3/test/qmake.qdocconf @@ -6,7 +6,7 @@ include(qt-defines.qdocconf) project = QMake description = QMake Manual -url = http://doc.qtsoftware.com/4.5 +url = http://qt.nokia.com/doc/4.5 indexes = $QT_BUILD_TREE/doc-build/html-qt/qt.index diff --git a/tools/qdoc3/test/qt-build-docs.qdocconf b/tools/qdoc3/test/qt-build-docs.qdocconf index 5169714..a8315aa 100644 --- a/tools/qdoc3/test/qt-build-docs.qdocconf +++ b/tools/qdoc3/test/qt-build-docs.qdocconf @@ -6,7 +6,7 @@ include(qt-defines.qdocconf) project = Qt description = Qt Reference Documentation -url = http://doc.qtsoftware.com/4.5 +url = http://qt.nokia.com/doc/4.5 edition.Console.modules = QtCore QtDBus QtNetwork QtScript QtSql QtXml \ QtXmlPatterns QtTest diff --git a/tools/qdoc3/test/qt-html-templates.qdocconf b/tools/qdoc3/test/qt-html-templates.qdocconf index dc027d0..e4e60dc 100644 --- a/tools/qdoc3/test/qt-html-templates.qdocconf +++ b/tools/qdoc3/test/qt-html-templates.qdocconf @@ -2,7 +2,7 @@ HTML.stylesheets = classic.css HTML.postheader = "\n" \ "\n" \ "\n" \ "" \ "
" \ - "" \ + "" \ "  " \ diff --git a/tools/qdoc3/test/qt-inc.qdocconf b/tools/qdoc3/test/qt-inc.qdocconf index d6cb0e6..86cd3fd 100644 --- a/tools/qdoc3/test/qt-inc.qdocconf +++ b/tools/qdoc3/test/qt-inc.qdocconf @@ -3,7 +3,7 @@ include(macros.qdocconf) project = Qt description = Qt Reference Documentation -url = http://doc.qtsoftware.com/4.5 +url = http://qt.nokia.com/doc/4.5 edition.Console = QtCore QtNetwork QtSql QtXml QtScript QtTest edition.Desktop = QtCore QtGui QtNetwork QtOpenGL QtSql QtSvg QtXml QtScript \ @@ -120,7 +120,7 @@ HTML.stylesheets = $QTDIR/util/qdoc3/test/classic.css HTML.postheader = "\n" \ "\n" \ "\n" \ "" \ "
" \ - "" \ + "" \ "  " \ @@ -137,7 +137,7 @@ HTML.postheader = "" \ "Functions" \ "\n" \ - "
" + "
" HTML.footer = "

\n" \ "\n" \ diff --git a/tools/qdoc3/test/qt.qdocconf b/tools/qdoc3/test/qt.qdocconf index f1fd8a2..b541db4 100644 --- a/tools/qdoc3/test/qt.qdocconf +++ b/tools/qdoc3/test/qt.qdocconf @@ -8,7 +8,7 @@ project = Qt versionsym = version = %VERSION% description = Qt Reference Documentation -url = http://doc.qtsoftware.com/4.5 +url = http://qt.nokia.com/doc/4.5 edition.Console.modules = QtCore QtDBus QtNetwork QtScript QtSql QtXml \ QtXmlPatterns QtTest diff --git a/tools/qdoc3/test/standalone-eclipse-integration.qdocconf b/tools/qdoc3/test/standalone-eclipse-integration.qdocconf index 3a22886..d61db54 100644 --- a/tools/qdoc3/test/standalone-eclipse-integration.qdocconf +++ b/tools/qdoc3/test/standalone-eclipse-integration.qdocconf @@ -6,6 +6,6 @@ macro.TheEclipseIntegration = The Qt Eclipse Integration HTML.footer = "

\n" \ "
\n" \ "\n" \ - "\n" \ + "\n" \ "\n" \ "
Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)TrademarksTrademarks
Qt Eclipse Integration 1.5.2
" -- cgit v0.12