Doc: Updated links in qt-webpages.qdoc to Digia equivalent.

Change-Id: I7b46898ae6ccc08d96095f1658f87c063aa6b487
Reviewed-by: Akseli Salovaara <akseli.salovaara@digia.com>
Reviewed-by: Martin Smith <martin.smith@digia.com>

12 files changed, 156 insertions, 362 deletions

diff --git a/doc/src/bughowto.qdoc b/doc/src/bughowto.qdoc
index 5adbb6a3c3..6509ee4fb0 100644
--- a/doc/src/bughowto.qdoc
+++ b/doc/src/bughowto.qdoc
@@ -33,7 +33,7 @@
     If you think you have found a bug in Qt, we would like to hear
     about it so that we can fix it.
 
-    Before reporting a bug, please check the \l{FAQs}, \l{Platform
+    Before reporting a bug, please check the \l{Platform
     and Compiler Notes}, and the \l{Qt Bug Tracker} on the Qt website to see
     if the issue is already known.
 
diff --git a/doc/src/development/qtestlib.qdoc b/doc/src/development/qtestlib.qdoc
index 4e5afcb831..ab5c3f1e04 100644
--- a/doc/src/development/qtestlib.qdoc
+++ b/doc/src/development/qtestlib.qdoc
@@ -84,11 +84,6 @@
          \o Custom types can easily be added to the test data and test output.
     \endtable
 
-    \note For higher-level GUI and application testing needs, please
-    see the \l{Partner Directory} for Qt testing products provided by
-    Nokia partners.
-
-
     \section1 QTestLib API
 
     All public methods are in the \l QTest namespace. In addition, the
@@ -755,7 +750,7 @@
     \section1 External Tools
 
     Tools for handling and visualizing test data are available as part of
-    the \l {qtestlib-tools} project in the \l{Qt Labs} web site.
+    the \l {qtestlib-tools} project in gitorious.org.
     These include a tool for comparing performance data obtained from test
     runs and a utility to generate Web-based graphs of performance data.
 
@@ -763,6 +758,3 @@
     for more information on these tools and a simple graphing example.
 
 */
-
-
-
diff --git a/doc/src/examples/editabletreemodel.qdoc b/doc/src/examples/editabletreemodel.qdoc
index 48ddc65925..cabe72488e 100644
--- a/doc/src/examples/editabletreemodel.qdoc
+++ b/doc/src/examples/editabletreemodel.qdoc
@@ -40,8 +40,7 @@
     example code.
 
     \note The model only shows the basic principles used when creating an
-    editable, hierarchical model. You may wish to use the \l{ModelTest}
-    project to test production models.
+    editable, hierarchical model.
 
     \section1 Overview
 
@@ -208,7 +207,7 @@
     As with the \l{itemviews/simpletreemodel}{Simple Tree Model} example,
     the \c TreeModel needs to be able to take a model index, find the
     corresponding \c TreeItem, and return model indexes that correspond to
-    its parents and children. 
+    its parents and children.
 
     In the diagram, we show how the model's \l{TreeModel::parent}{parent()}
     implementation obtains the model index corresponding to the parent of
diff --git a/doc/src/external-resources.qdoc b/doc/src/external-resources.qdoc
index 1e68ee3ade..f92df5e345 100644
--- a/doc/src/external-resources.qdoc
+++ b/doc/src/external-resources.qdoc
@@ -507,4 +507,4 @@
 /*!
     \externalpage https://developer.apple.com/library/mac/#releasenotes/General/SubmittingToMacAppStore/_index.html#//apple_ref/doc/uid/TP40010572
     \title Submitting to the Mac App Store
-*/
\ No newline at end of file
+*/
diff --git a/doc/src/files-and-resources/resources.qdoc b/doc/src/files-and-resources/resources.qdoc
index 49004b53d2..21ad2a5f9c 100644
--- a/doc/src/files-and-resources/resources.qdoc
+++ b/doc/src/files-and-resources/resources.qdoc
@@ -165,7 +165,7 @@
     argument.
 
     \code
-        rcc -no-compress myresources.qrc 
+        rcc -no-compress myresources.qrc
     \endcode
 
     \c rcc also gives you some control over the compression. You can
diff --git a/doc/src/getting-started/how-to-learn-qt.qdoc b/doc/src/getting-started/how-to-learn-qt.qdoc
index 9c78ee7aad..b49ed9828b 100644
--- a/doc/src/getting-started/how-to-learn-qt.qdoc
+++ b/doc/src/getting-started/how-to-learn-qt.qdoc
@@ -160,10 +160,6 @@
 
     In addition, many Qt developers are active members of the \l{KDE}{KDE community}.
 
-    \section1 Books about Qt
-
-    There is a growing number of books about Qt programming. The Qt team maintains a list of books on the Qt Developer Network site. See \l{Books about Qt Programming} for a complete list of Qt books including translations to various languages.
-
     \section1 Training
 
     In many cases people prefer attending professional training courses to boost their learning progress. A training course has two unique benefits: Its scope can be adapted to your needs and you will get helped on the spot by Qt trainers who are also experienced Qt developers. \l{Qt Training Partners} offer a wide range of courses. Most courses are based on materials developed by the Qt team.
diff --git a/doc/src/getting-started/installation.qdoc b/doc/src/getting-started/installation.qdoc
index 07188b9a39..7949659e45 100644
--- a/doc/src/getting-started/installation.qdoc
+++ b/doc/src/getting-started/installation.qdoc
@@ -143,7 +143,7 @@ for your platform from the following list.
     \o \l{Configuring Qt}
     \o \l{How to Learn Qt}
     \o \l{Tutorials}
-    \o \l{Developer Zone}
+    \o \l{Developer Network}
     \o \l{Deploying Qt Applications}
     \endlist
 
@@ -263,7 +263,7 @@ for your platform from the following list.
     \list
     \o \l{How to Learn Qt}
     \o \l{Tutorials}
-    \o \l{Developer Zone}
+    \o \l{Developer Network}
     \o \l{Deploying Qt Applications}
     \endlist
 
@@ -386,7 +386,7 @@ must be run as root.
     \list
     \o \l{How to Learn Qt}
     \o \l{Tutorials}
-    \o \l{Developer Zone}
+    \o \l{Developer Network}
     \o \l{Deploying Qt Applications}
     \endlist
 
@@ -474,7 +474,7 @@ in the \l{Qt for Windows CE Requirements} document.
     \list
     \o \l{How to Learn Qt}
     \o \l{Tutorials}
-    \o \l{Developer Zone}
+    \o \l{Developer Network}
     \o \l{Deploying Qt Applications}
     \endlist
 
@@ -504,7 +504,7 @@ in the \l{Qt for Windows CE Requirements} document.
 
 \tableofcontents
 
-    Qt for Symbian binary packages (SIS files) are available from the \l 
+    Qt for Symbian binary packages (SIS files) are available from the \l
     {http://qt.nokia.com/downloads}{Qt SDK}.
 
 */
@@ -516,8 +516,8 @@ in the \l{Qt for Windows CE Requirements} document.
 \previouspage Installation
 \tableofcontents
 
-    \l {http://qt.nokia.com/downloads}{Qt SDK} provides all the necessary tools 
-    and libraries for developing Qt applications. However, if you want to build 
+    \l {http://qt.nokia.com/downloads}{Qt SDK} provides all the necessary tools
+    and libraries for developing Qt applications. However, if you want to build
     Qt itself for Symbian, follow the instructions below.
 
 Qt for the Symbian platform has some requirements that are given in more detail
@@ -607,31 +607,31 @@ the Symbian platform from scratch.
     Congratulations, Qt is now ready to use.
 
 \section1 Step 7: Installing Qt Libraries on the Device
-    
+
     To run a Qt application on a device, it must have Qt libraries installed.
-    
+
     Symbian devices have a pre-installed Qt as follows:
     \list
     \o Symbian Anna devices have the pre-installed Qt, Qt Mobility, and Qt Webkit.
     \o Symbian Belle and later devices have the pre-installed Qt on the device firmware.
     \endlist
-    
+
     \l {http://www.developer.nokia.com/Community/Wiki/Nokia_Smart_Installer_for_Symbian}
-    {Nokia Smart Installer for Symbian} deploys the required Qt libraries to supported S60 
+    {Nokia Smart Installer for Symbian} deploys the required Qt libraries to supported S60
     and Symbian devices if the libraries are not pre-installed.
-    
+
     Nokia Developer site's \l {http://www.developer.nokia.com/Devices/Device_specifications/?filter1=qt}
     {Device specifications} provide information on which devices have a
     pre-installed Qt and the used Qt version.
-    
+
     To create your own Qt installation package, do as follows:
 
     \snippet doc/src/snippets/code/doc_src_installation.qdoc 29
 
-    The Qt libraries are built with "All -Tcb" capability, so they can support 
-    all types of applications. If you don't have a suitable certificate, you can 
+    The Qt libraries are built with "All -Tcb" capability, so they can support
+    all types of applications. If you don't have a suitable certificate, you can
     patch the binaries in either of the following ways:
-    
+
     \list
     \o If you have no certificate, build a self-signed Qt:
     \snippet doc/src/snippets/code/doc_src_installation.qdoc 34
@@ -1286,11 +1286,11 @@ We hope you will enjoy using Qt.
     \brief Setting up the Symbian platform environment for Qt.
     \previouspage General Qt Requirements
 
-    \l {http://qt.nokia.com/downloads}{Qt SDK} provides all the necessary tools 
-    and libraries for developing Qt applications. However, if you want to build 
+    \l {http://qt.nokia.com/downloads}{Qt SDK} provides all the necessary tools
+    and libraries for developing Qt applications. However, if you want to build
     Qt itself for Symbian, follow the instructions below.
-    
-    Qt for the Symbian platform requires the following software installed on 
+
+    Qt for the Symbian platform requires the following software installed on
     your development PC:
     \list
         \o \l{http://www.forum.nokia.com/Library/Tools_and_downloads/Other/Carbide.c++/}{Carbide.c++ v2.3.0 or higher recommended}.
diff --git a/doc/src/porting/porting4-overview.qdoc b/doc/src/porting/porting4-overview.qdoc
index c837b11d4a..6717520bda 100644
--- a/doc/src/porting/porting4-overview.qdoc
+++ b/doc/src/porting/porting4-overview.qdoc
@@ -254,10 +254,10 @@
 
     \section1 Significantly Changed Features
 
-    Some Qt 3 features have changed significantly for Qt 4. 
+    Some Qt 3 features have changed significantly for Qt 4.
     and the recommended way of using them has therefore changed
-    significantly, too. This is most notably true for the drag 
-    and drop API. 
+    significantly, too. This is most notably true for the drag
+    and drop API.
 
     Additionally, some of the more specialized features in Qt 3 are
     often used to help customize widgets and add extra polish to an
@@ -297,12 +297,6 @@
     unnecessary with Qt 4 because double buffering is
     automatically performed by the paint engine.
 
-    It still makes sense to use double buffering in
-    Qt 4 in certain contexts. For example, in
-    Chapter 5 of \l{GUI Programming with Qt 3}, double buffering
-    was presented as a speed optimization and not just as a means
-    of reducing flicker.
-
     \section2 Data-Aware Forms
 
     The \c QDataTable, \c QDataBrowser, and \c QDataView classes
@@ -354,6 +348,6 @@
     \section2 Events
     In Qt 3, QCloseEvents were not accepted by default. In Qt 4,
     the event handler QWidget::closeEvent() receives QCloseEvents,
-    and accepts them by default closing the application. To avoid 
-    this, please reimplement QWidget::closeEvent().  
+    and accepts them by default closing the application. To avoid
+    this, please reimplement QWidget::closeEvent().
 */
diff --git a/doc/src/qt-webpages.qdoc b/doc/src/qt-webpages.qdoc
index 10ec02b4c9..bfedceaaa2 100644
--- a/doc/src/qt-webpages.qdoc
+++ b/doc/src/qt-webpages.qdoc
@@ -24,12 +24,9 @@
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
+
 /*!
-    \externalpage http://qt.nokia.com/
-    \title Qt website
-*/
-/*!
-    \externalpage http://qt.nokia.com/
+    \externalpage http://qt-project.org/
     \title Qt Homepage
 */
 /*!
@@ -37,103 +34,63 @@
     \title Qt Bug Tracker
 */
 /*!
-    \externalpage http://bugreports.qt-project.org
-    \title Bug Report Form
-*/
-/*!
-    \externalpage http://qt.nokia.com/services-partners/partners/partner-directory
-    \title Partner Directory
-*/
-/*!
-    \externalpage http://qt.nokia.com/products/add-on-products
-    \title Qt Solutions
-*/
-/*!
-    \externalpage http://qt.nokia.com/developer/books
-    \title Books about Qt Programming
-*/
-/*!
-    \externalpage http://qt.nokia.com/developer/books/3
-    \title GUI Programming with Qt 3
-*/
-/*!
-    \externalpage http://qt.nokia.com/about
+    \externalpage http://qt.digia.com/Product/
     \title About Qt
 */
 /*!
-    \externalpage http://qt.nokia.com/products/developer-tools
+    \externalpage http://qt.digia.com/Product/Developer-Tools/
     \title Visual Studio Integration
 */
 /*!
-    \externalpage http://qt.nokia.com/products/developer-tools
+    \externalpage http://qt.digia.com/Product/Developer-Tools/
     \title Qt Creator Product Page
 */
 /*!
-    \externalpage http://qt.nokia.com/products/add-on-products/catalog/4/Widgets/qtcalendarwidget/
-    \title Calendar Widget
-*/
-/*!
-    \externalpage http://qt.nokia.com/products/add-on-products/catalog/4/Widgets/qtwizard/
-    \title QtWizard
-*/
-/*!
-    \externalpage http://qt.nokia.com/products/add-on-products/catalog/4/Utilities/qtcorba/
+    \externalpage http://qt.digia.com/products/add-on-products/catalog/4/Utilities/qtcorba/
     \title CORBA Framework
 */
 /*!
-    \externalpage http://qt.nokia.com/products/add-on-products/catalog/4/Widgets/qtwindowlistmenu/
+    \externalpage http://doc.qt.digia.com/qq/qq09-qt-solutions.html
     \title Window Menu
 */
 /*!
-    \externalpage http://qt.nokia.com/qt-in-use
-    \title Customer Success Stories
+    \externalpage http://qt-project.org
+    \title Developer Network
 */
 /*!
-    \externalpage http://qt.nokia.com/developer
-    \title Developer Zone
-*/
-/*!
-    \externalpage http://qt.nokia.com/downloads
+    \externalpage http://qt.digia.com/downloads
     \title Downloads
 */
 /*!
-    \externalpage http://qt.nokia.com/developer/faqs/
-    \title FAQs
-*/
-/*!
-    \externalpage http://qt.nokia.com/developer/faqs/licensing/
+    \externalpage http://qt.digia.com/licensing/
     \title License FAQ
 */
 /*!
-    \externalpage http://qt.nokia.com/products/licensing/
+    \externalpage http://qt.digia.com/products/licensing/
     \title Free Software and Contributions
 */
 /*!
-    \externalpage http://qt.nokia.com/products/licensing/
+    \externalpage http://qt.digia.com/products/licensing/
     \title Qt Licensing Overview
 */
 /*!
-    \externalpage http://qt.nokia.com/products/pricing/
+    \externalpage http://qt.digia.com/products/licensing/
     \title Qt License Pricing
 */
 /*!
-    \externalpage http://doc.qt.nokia.com/supported-platforms.html
+    \externalpage http://qt-project.org/doc/qt-4.8/supported-platforms.html
     \title Platform Support Policy
 */
 /*!
-    \externalpage http://qt.nokia.com/products/
+    \externalpage http://qt.digia.com/product/
     \title Product Overview
 */
 /*!
-    \externalpage http://doc.qt.nokia.com/supported-platforms.html
+    \externalpage http://qt-project.org/doc/qt-4.8/supported-platforms.html
     \title Qt 4 Platforms Overview
 */
 /*!
-    \externalpage http://www.qtextended.org/
-    \title Qt Extended
-*/
-/*!
-    \externalpage http://doc.qt.nokia.com/qq/
+    \externalpage http://doc.qt.digia.com/qq/
     \title Qt Quarterly
 */
 /*!
@@ -141,55 +98,47 @@
     \title Task Tracker
 */
 /*!
-    \externalpage http://lists.qt.nokia.com/
+    \externalpage http://lists.qt-project.org/
     \title Qt Mailing Lists
 */
 /*!
-    \externalpage http://qt.nokia.com/products/files/pdf/
+    \externalpage http://qt-project.org/wiki/Category:Learning::Whitepapers
     \title Whitepapers
 */
 /*!
-    \externalpage http://doc.qt.nokia.com/qtcanvas
+    \externalpage http://qt.digia.com/product/
     \title QtCanvas
 */
 /*!
-    \externalpage http://labs.qt.nokia.com/page/Projects/Itemview/Modeltest
-    \title ModelTest
-*/
-/*!
-    \externalpage http://labs.qt.nokia.com/page/Projects/Accessibility/QDBusBridge
+    \externalpage http://blog.qt.digia.com/2007/08/10/qt-d-bus-accessibility-bridge-on-labstrolltechcom/
     \title D-Bus Accessibility Bridge
 */
 /*!
-    \externalpage http://labs.qt.nokia.com/blogs/2008/12/05/qtestlib-now-with-nice-graphs-pointing-upwards/
+    \externalpage http://blog.qt.digia.com/2008/12/05/qtestlib-now-with-nice-graphs-pointing-upwards/
     \title qtestlib-tools Announcement
 */
 /*!
-    \externalpage http://qt.nokia.com/products/library/modular-class-library#info_scripting
+    \externalpage http://qt.digia.com/products/library/modular-class-library#info_scripting
     \title Qt Script for Applications (QSA)
 */
 /*!
-    \externalpage http://qt.nokia.com/products/add-on-products/catalog/4/Utilities/qtsharedmemory/
+    \externalpage http://qt.digia.com/products/add-on-products/catalog/4/Utilities/qtsharedmemory/
     \title QtSharedMemory
 */
 /*!
-    \externalpage http://qt.nokia.com/qq/qq21-portingcanvas.html
+    \externalpage http://qt.digia.com/qq/qq21-portingcanvas.html
     \title Porting to Qt 4.2's Graphics View
 */
 /*!
-    \externalpage http://qt.nokia.com/products/add-on-products/catalog/4/Windows/qtwinforms/
+    \externalpage http://qt.digia.com/products/add-on-products/catalog/4/Windows/qtwinforms/
     \title QtWinForms Solution
 */
 /*!
-    \externalpage http://qt.nokia.com/developer/faqs/qt/installation
-    \title Installation FAQ
-*/
-/*!
     \externalpage http://qt.gitorious.org
     \title Public Qt Repository
 */
 /*!
-    \externalpage http://get.qt.nokia.com/nokiasmartinstaller/
+    \externalpage http://www.developer.nokia.com/Community/Wiki/Nokia_Smart_Installer_for_Symbian
     \title Smart Installer
 */
 /*!
@@ -197,450 +146,342 @@
     \title qtestlib-tools
 */
 /*!
-    \externalpage http://labs.qt.nokia.com
-    \title Qt Labs
-*/
-/*!
-    \externalpage http://doc.qt.nokia.com/
+    \externalpage http://
     \title Qt Docs Web Start Page
 */
 /*!
-    \externalpage http://doc.qt.nokia.com/qtcreator/creator-qml-application.html
+    \externalpage http://qt-project.org/doc/qtcreator-2.5/creator-visual-editor.html
     \title external: Developing Qt Quick Applications with Creator
 */
 /*!
-    \externalpage http://qt.gitorious.org/qt/pages/QtCodingStyle
+    \externalpage http://qt-project.org/wiki/Qt_Coding_Style
     \title Qt Coding Style
 */
 /*!
-    \externalpage http://developer.qt.nokia.com/forums
+    \externalpage http://qt-project.org/forums
     \title Forums on Qt Developer Network
 */
 /*!
-    \externalpage http://developer.qt.nokia.com/wiki
+    \externalpage http://qt-project.org/wiki/
     \title Wiki on Qt Developer Network
 */
 /*!
-    \externalpage http://developer.qt.nokia.com/wiki/QtCreatorWhitepaper
+    \externalpage http://qt-project.org/wiki/QtCreatorWhitepaper
     \title Qt Creator Whitepaper
 */
 /*!
-    \externalpage http://developer.qt.nokia.com/wiki/QtWhitepaper
+    \externalpage http://qt-project.org/wiki/Category:Learning::Whitepaper
     \title Qt Whitepaper
 */
 /*!
-    \externalpage http://doc.qt.nokia.com/qtcreator/creator-visual-editor.html
+    \externalpage http://qt-project.org/doc/qtcreator-2.5/creator-visual-editor.html
     \title external: Developing Qt Quick Applications
 */
 /*!
-    \externalpage http://doc.qt.nokia.com/qtcreator/creator-publish-ovi.html
+    \externalpage http://qt-project.org/doc/qtcreator-2.5/creator-publish-ovi.html
     \title external: Publishing Applications to Ovi Store
 */
 /*!
-    \externalpage http://doc.qt.nokia.com/qtcreator/index.html
+    \externalpage http://qt-project.org/doc/qtcreator-2.5/
     \title external: Qt Creator Manual
 */
 /*!
-    \externalpage http://doc.qt.nokia.com/qtcreator/creator-developing-symbian.html
+    \externalpage http://qt-project.org/doc/qtcreator-2.5/creator-developing-symbian.html
     \title external: Setting Up Development Environment for Symbian
 */
 /*!
-    \externalpage http://doc.qt.nokia.com/qtcreator/creator-developing-maemo.html
+    \externalpage http://qt-project.org/doc/qtcreator-2.5/creator-developing-maemo.html
     \title external: Setting Up Development Environment for Maemo
 */
 /*!
-    \externalpage http://doc.qt.nokia.com/qtmobility/index.html
+    \externalpage http://doc.qt.digia.com/qtmobility/index.html
     \title external: Qt Mobility Manual
 */
 /*!
-    \externalpage http://doc.qt.nokia.com/qtmobility/qml-plugins.html
+    \externalpage http://doc.qt.digia.com/qtmobility/qml-plugins.html
     \title external: Qt Mobility QML Plugins
 */
 /*!
-    \externalpage http://doc.qt.nokia.com/qtsimulator/index.html
+    \externalpage http://doc.qt.digia.com/qtsimulator/index.html
     \title external: Qt Simulator Manual
 */
 /*!
-    \externalpage http://qt.nokia.com/products/qt-sdk
+    \externalpage http://qt.digia.com/Product/Qt-SDK/
     \title Qt SDK Product Page
 */
 /*!
-    \externalpage http://doc.qt.nokia.com/nokia-qtsdk-latest/index.html
+    \externalpage http://doc.qt.digia.com/sdk-1.2/index.html
     \title external: Qt SDK Manual
 */
 /*!
-    \externalpage http://doc.qt.nokia.com/qtcreator/creator-project-managing.html
+    \externalpage http://qt-project.org/doc/qtcreator-2.5/creator-project-managing.html
     \title external: Creating Qt Projects in Creator
 */
 /*!
-    \externalpage http://doc.qt.nokia.com/qtcreator/creator-building-running.html
+    \externalpage http://qt-project.org/doc/qtcreator-2.5/creator-building-running.html
     \title external: Building and Running Applications in Creator
 */
 /*!
-    \externalpage http://doc.qt.nokia.com/qtcreator/creator-running-targets.html
+    \externalpage http://qt-project.org/doc/qtcreator-2.5/creator-running-targets.html
     \title external: Set Compiler Targets in Creator
 */
 /*!
-    \externalpage http://doc.qt.nokia.com/qtcreator/creator-build-settings.html
+    \externalpage http://qt-project.org/doc/qtcreator-2.5/creator-build-settings.html
     \title external: Build Settings in Creator
 */
 /*!
-    \externalpage http://doc.qt.nokia.com/qtcreator/creator-run-settings.html
+    \externalpage http://qt-project.org/doc/qtcreator-2.5/creator-run-settings.html
     \title external: Run Settings in Creator
 */
 /*!
-    \externalpage http://doc.qt.nokia.com/qtcreator/creator-using-qt-designer.html
+    \externalpage http://qt-project.org/doc/qtcreator-2.5/creator-using-qt-designer.html
     \title external: Designer in Creator
 */
 /*!
-    \externalpage http://doc.qt.nokia.com/qtcreator/creator-debugging.html
+    \externalpage http://qt-project.org/doc/qtcreator-2.5/creator-debugging.html
     \title external: Debugging Applications in Creator
 */
 /*!
-    \externalpage http://doc.qt.nokia.com/qtcreator/creator-deployment-symbian.html
+    \externalpage http://qt-project.org/doc/qtcreator-2.5/creator-deployment-symbian.html
     \title external: Symbian Deployment in Creator
 */
 /*!
-    \externalpage http://doc.qt.nokia.com/qtcreator/creator-deployment-maemo.html
+    \externalpage http://qt-project.org/doc/qtcreator-2.5/creator-deployment-maemo.html
     \title external: Maemo Deployment in Creator
 */
 /*!
-    \externalpage http://doc.qt.nokia.com/qtmobility/multimedia.html
+    \externalpage http://doc.qt.digia.com/qtmobility/multimedia.html
     \title external: Mobility Multimedia
 */
 /*!
-    \externalpage http://doc.qt.nokia.com/qtmobility/location-overview.html
+    \externalpage http://doc.qt.digia.com/qtmobility/location-overview.html
     \title external: Mobility Location
 */
 /*!
-    \externalpage http://qt.nokia.com/partners/training/
+    \externalpage http://qt.digia.com/Services/training/
     \title Qt Training Partners
 */
 /*!
-    \externalpage http://qt.nokia.com/partners/training/course-schedule
+    \externalpage http://qt.digia.com/Services/training/
     \title Open Enrollment Qt Training Courses
 */
 /*!
-    \externalpage http://qt.nokia.com/developer/learning/online/training/training-day-at-developer-days-2009/
-    \title Training Day at Qt Developer Days 2009
-*/
-/*!
-    \externalpage http://doc.qt.nokia.com/qtmobility/all-examples.html
+    \externalpage http://doc.qt.digia.com/qtmobility/all-examples.html
     \title external: Qt Mobility Examples
 */
 /*!
-    \externalpage http://developer.qt.nokia.com/elearning
+    \externalpage http://qt-project.org/videos
     \title Qt Video Portal
 */
 /*!
-    \externalpage http://qt.nokia.com/developer/learning/online/training
-    \title Qt eLearning
-*/
-/*!
-    \externalpage http://qt.nokia.com/developer/learning/online/training
+    \externalpage http://qt-project.org/wiki/developer-guides
     \title Qt eLearning Training Materials
 */
 /*!
-    \externalpage http://qt.nokia.com/developer/learning/online/talks/developerdays2010
+    \externalpage http://qt-project.org/videos/watch
     \title Qt Developer Days 2010
 */
 /*!
-    \externalpage http://developer.qt.nokia.com/wiki/Category:LanguageBindings
+    \externalpage http://qt-project.org/wiki/Category:LanguageBindings
     \title Qt Language Bindings on Wiki
 */
 /*!
-    \externalpage http://developer.qt.nokia.com/elearning/watch/qt_programming_essentials_by_ics_part_1
+    \externalpage http://qt-project.org/videos/watch/qt_programming_essentials_by_ics_part_1
     \title Qt Essentials by ICS part 1
 */
 /*!
-    \externalpage http://developer.qt.nokia.com/elearning/watch/qt_programming_essentials_by_ics_part_2
+    \externalpage http://qt-project.org/videos/watch/qt_programming_essentials_by_ics_part_2
     \title Qt Essentials by ICS part 2
 */
 /*!
-    \externalpage http://developer.qt.nokia.com/elearning/watch/qt_programming_essentials_by_kdab_part_1
+    \externalpage http://qt-project.org/videos/watch/qt_programming_essentials_by_kdab_part_1
     \title Qt Essentials by KDAB part 1
 */
 /*!
-    \externalpage http://developer.qt.nokia.com/elearning/watch/qt_programming_essentials_by_kdab_part_2
+    \externalpage http://qt-project.org/videos/watch/qt_programming_essentials_by_kdab_part_2
     \title Qt Essentials by KDAB part 2
 */
 /*!
-    \externalpage http://developer.qt.nokia.com/elearning/watch/programming_with_qt_qgraphicsview_by_ics
+    \externalpage http://qt-project.org/videos/watch/programming_with_qt_qgraphicsview_by_ics
     \title QGraphicsView by ICS
 */
 /*!
-    \externalpage http://developer.qt.nokia.com/elearning/watch/programming_with_qt_qgraphicsview_by_kdab
+    \externalpage http://qt-project.org/videos/watch/programming_with_qt_qgraphicsview_by_kdab
     \title QGraphicsView by KDAB
 */
 /*!
-    \externalpage http://developer.qt.nokia.com/elearning/watch/programming_with_qt_multithreading_by_ics
+    \externalpage http://qt-project.org/videos/watch/programming_with_qt_multithreading_by_ics
     \title Multithreading by ICS
 */
 /*!
-    \externalpage http://developer.qt.nokia.com/elearning/watch/programming_with_qt_multithreading_by_kdab
+    \externalpage http://qt-project.org/videos/watch/programming_with_qt_multithreading_by_kdab
     \title Multithreading by KDAB
 */
 /*!
-    \externalpage http://developer.qt.nokia.com/elearning/watch/training_teaser_ui_development_with_qt_by_ics
+    \externalpage http://qt-project.org/videos/watch/training_teaser_ui_development_with_qt_by_ics
     \title UI Development with Qt by ICS
 */
 /*!
-    \externalpage http://developer.qt.nokia.com/elearning/watch/training_teaser_ui_development_with_qt_by_kdab
+    \externalpage http://qt-project.org/videos/watch/training_teaser_ui_development_with_qt_by_kdab
     \title UI Development with Qt by KDAB
 */
 /*!
-    \externalpage http://developer.qt.nokia.com/elearning/watch/training_teaser_embedded_development_by_basyskom
+    \externalpage http://qt-project.org/videos/watch/training_teaser_embedded_development_by_basyskom
     \title Embedded Development by basysKom
 */
 /*!
-    \externalpage http://developer.qt.nokia.com/elearning/watch/training_teaser_embedded_development_by_ics
+    \externalpage http://qt-project.org/videos/watch/training_teaser_embedded_development_by_ics
     \title Embedded Development by ICS
 */
 /*!
-    \externalpage http://developer.qt.nokia.com/elearning/watch/programming_with_qt_model_view_programming_by_basyskom
+    \externalpage http://qt-project.org/videos/watch/programming_with_qt_model_view_programming_by_basyskom
     \title ModelView Programming by basysKom
 */
 /*!
-    \externalpage http://developer.qt.nokia.com/elearning/watch/programming_with_qt_model_view_programming_by_kdab
+    \externalpage http://qt-project.org/videos/watch/programming_with_qt_model_view_programming_by_kdab
     \title ModelView Programming by KDAB
 */
 /*!
-    \externalpage http://developer.qt.nokia.com/elearning/watch/programming_with_qt_webkit_by_kdab
+    \externalpage http://qt-project.org/videos/watch/programming_with_qt_webkit_by_kdab
     \title QWebKit by KDAB
 */
 /*!
-    \externalpage http://developer.qt.nokia.com/elearning/watch/qt_quick_introduction_to_qt_quick_part_1_4
+    \externalpage http://qt-project.org/videos/watch/qt_quick_introduction_to_qt_quick_part_1_4
     \title Quick by KDAB part 1
 */
 /*!
-    \externalpage http://developer.qt.nokia.com/elearning/watch/qt_quick_user_interaction_user_input_and_states_part_2_4
+    \externalpage http://qt-project.org/videos/watch/qt_quick_user_interaction_user_input_and_states_part_2_4
     \title Quick by KDAB part 2
 */
 /*!
-    \externalpage http://developer.qt.nokia.com/elearning/watch/qt_quick_animations_and_visual_effects_part_3_4
+    \externalpage http://qt-project.org/videos/watch/qt_quick_animations_and_visual_effects_part_3_4
     \title Quick by KDAB part 3
 */
 /*!
-    \externalpage http://developer.qt.nokia.com/elearning/watch/qt_quick_small_projects_arranging_items_qmlcomponentsand_debugging_qml_part
+    \externalpage http://qt-project.org/videos/watch/qt_quick_small_projects_arranging_items_qmlcomponentsand_debugging_qml_part
     \title Quick by KDAB part 4
 */
 /*!
-    \externalpage http://developer.qt.nokia.com/elearning/watch/qt_mobile_development_for_nokia_devices_introduction_to_qt_on_mobile_part_1
+    \externalpage http://qt-project.org/videos/watch/qt_mobile_development_for_nokia_devices_introduction_to_qt_on_mobile_part_1
     \title Qt Mobile Development for Nokia Devices by Digia part 1
 */
 /*!
-    \externalpage http://developer.qt.nokia.com/elearning/watch/qt_mobile_development_for_nokia_devices_mobile_ui_design_technologies_and_a
+    \externalpage http://qt-project.org/videos/watch/qt_mobile_development_for_nokia_devices_mobile_ui_design_technologies_and_a
     \title Qt Mobile Development for Nokia Devices by Digia part 2
 */
 /*!
-    \externalpage http://developer.qt.nokia.com/elearning/watch/qt_mobile_development_for_nokia_devices_getting_started_with_nokia_qt_sdk_p
+    \externalpage http://qt-project.org/videos/watch/qt_mobile_development_for_nokia_devices_getting_started_with_nokia_qt_sdk_p
     \title Qt Mobile Development for Nokia Devices by Digia part 3
 */
 
 /*!
-    \externalpage http://developer.qt.nokia.com/elearning/watch/qt_essentials_widget_edition_fundamentals_of_qt_part_2_hello_world_in_qtcre
+    \externalpage http://qt-project.org/videos/watch/qt_essentials_widget_edition_fundamentals_of_qt_part_2_hello_world_in_qtcre
     \title Qt Essentials - Fundamentals of Qt part 1
 */
 /*!
-    \externalpage http://developer.qt.nokia.com/elearning/watch/qt_essentials_widget_edition_fundamentals_of_qt_part_1_your_first_qt_applic
+    \externalpage http://qt-project.org/videos/watch/qt_essentials_widget_edition_fundamentals_of_qt_part_1_your_first_qt_applic
     \title Qt Essentials - Fundamentals of Qt part 2
 */
 /*!
-    \externalpage http://developer.qt.nokia.com/elearning/watch/qt_essentials_widget_edition_application_creation_part_1_mainwindows
+    \externalpage http://qt-project.org/videos/watch/qt_essentials_widget_edition_application_creation_part_1_mainwindows
     \title Qt Essentials - Application Creation part 1
 */
 /*!
-    \externalpage http://developer.qt.nokia.com/elearning/watch/application_creation_part_2_settings_resources_and_application_deployment
+    \externalpage http://qt-project.org/videos/watch/application_creation_part_2_settings_resources_and_application_deployment
     \title Qt Essentials - Application Creation part 2
 */
 /*!
-    \externalpage http://developer.qt.nokia.com/elearning/watch/application_creation_part_3_translation_for_developers
+    \externalpage http://qt-project.org/videos/watch/application_creation_part_3_translation_for_developers
     \title Qt Essentials - Application Creation part 3
 */
 /*!
-    \externalpage http://developer.qt.nokia.com/elearning/watch/widgets_part_1_common_widgets
+    \externalpage http://qt-project.org/videos/watch/widgets_part_1_common_widgets
     \title Qt Essentials - Widgets part 1
 */
 /*!
-    \externalpage http://developer.qt.nokia.com/elearning/watch/widgets_part_2_layout_management
+    \externalpage http://qt-project.org/videos/watch/widgets_part_2_layout_management
     \title Qt Essentials - Widgets part 2
 */
 /*!
-    \externalpage http://developer.qt.nokia.com/elearning/watch/widgets_part_3_guidelines_for_custom_widgets
+    \externalpage http://qt-project.org/videos/watch/widgets_part_3_guidelines_for_custom_widgets
     \title Qt Essentials - Widgets part 3
 */
 /*!
-    \externalpage http://developer.qt.nokia.com/elearning/watch/graphics_view_part_1_using_graphicsview_classes
+    \externalpage http://qt-project.org/videos/watch/graphics_view_part_1_using_graphicsview_classes
     \title Qt Essentials - Graphics View part 1
 */
 /*!
-    \externalpage http://developer.qt.nokia.com/elearning/watch/graphics_view_part_2_transformations_and_coordinate_systems
+    \externalpage http://qt-project.org/videos/watch/graphics_view_part_2_transformations_and_coordinate_systems
     \title Qt Essentials - Graphics View part 2
 */
 /*!
-    \externalpage http://developer.qt.nokia.com/elearning/watch/graphics_view_part_3_creating_custom_items
+    \externalpage http://qt-project.org/videos/watch/graphics_view_part_3_creating_custom_items
     \title Qt Essentials - Graphics View part 3
 */
 /*!
-    \externalpage http://developer.qt.nokia.com/elearning/watch/model_view_part_1_model_view_concept
+    \externalpage http://qt-project.org/videos/watch/model_view_part_1_model_view_concept
     \title Qt Essentials - Model/View I part 1
 */
 /*!
-    \externalpage http://developer.qt.nokia.com/elearning/watch/model_view_part_2_showing_simple_data
+    \externalpage http://qt-project.org/videos/watch/model_view_part_2_showing_simple_data
     \title Qt Essentials - Model/View I part 2
 */
 /*!
-    \externalpage http://developer.qt.nokia.com/elearning/watch/model_view_part_3_proxy_models
+    \externalpage http://qt-project.org/videos/watch/model_view_part_3_proxy_models
     \title Qt Essentials - Model/View I part 3
 */
 /*!
-    \externalpage http://developer.qt.nokia.com/elearning/watch/model_view_part_4_custom_models
+    \externalpage http://qt-project.org/videos/watch/model_view_part_4_custom_models
     \title Qt Essentials - Model/View I part 4
 */
 /*!
-    \externalpage http://developer.qt.nokia.com/elearning/watch/model_view_ii_part_1_editing_item_data
+    \externalpage http://qt-project.org/videos/watch/model_view_ii_part_1_editing_item_data
     \title Qt Essentials - Model/View II part 1
 */
 /*!
-    \externalpage
+    \externalpage http://qt-project.org/videos/watch/model_view_ii_part_2_delegates
     \title Qt Essentials - Model/View II part 2
 */
 /*!
-    \externalpage http://developer.qt.nokia.com/elearning/watch/model_view_ii_part_3_data_widget_mapper
+    \externalpage http://qt-project.org/videos/watch/model_view_ii_part_3_data_widget_mapper
     \title Qt Essentials - Model/View II part 3
 */
 /*!
-    \externalpage http://developer.qt.nokia.com/elearning/watch/model_view_ii_part_4_custom_tree_model
+    \externalpage http://qt-project.org/videos/watch/model_view_ii_part_4_custom_tree_model
     \title Qt Essentials - Model/View II part 4
 */
 /*!
-    \externalpage http://developer.qt.nokia.com/elearning/watch/model_view_ii_part_5_drag_and_drop
+    \externalpage http://qt-project.org/videos/watch/model_view_ii_part_5_drag_and_drop
     \title Qt Essentials - Model/View II part 5
 */
 /*!
-    \externalpage http://qt.nokia.com/certification
+    \externalpage http://qt.digia.com/Product/Learning/Certification/
     \title Qt Certification
 */
 /*!
-    \externalpage http://qt.nokia.com/developer/learning/certification/exams/preparation-prerequisites
+    \externalpage http://qt.digia.com/Product/Learning/Certification/
     \title Qt Certification Exam Preparation and Prerequisites
 */
-
-/*!
-    \externalpage http://developer.qt.nokia.com/elearning/watch/qt_essentials_widget_edition_fundamentals_of_qt_part_2_hello_world_in_qtcre
-    \title Qt Essentials - Fundamentals of Qt part 1
-*/
-/*!
-    \externalpage http://developer.qt.nokia.com/elearning/watch/qt_essentials_widget_edition_fundamentals_of_qt_part_1_your_first_qt_applic
-    \title Qt Essentials - Fundamentals of Qt part 2
-*/
-/*!
-    \externalpage http://developer.qt.nokia.com/elearning/watch/qt_essentials_widget_edition_application_creation_part_1_mainwindows
-    \title Qt Essentials - Application Creation part 1
-*/
-/*!
-    \externalpage http://developer.qt.nokia.com/elearning/watch/application_creation_part_2_settings_resources_and_application_deployment
-    \title Qt Essentials - Application Creation part 2
-*/
-/*!
-    \externalpage http://developer.qt.nokia.com/elearning/watch/application_creation_part_3_translation_for_developers
-    \title Qt Essentials - Application Creation part 3
-*/
-/*!
-    \externalpage http://developer.qt.nokia.com/elearning/watch/widgets_part_1_common_widgets
-    \title Qt Essentials - Widgets part 1
-*/
 /*!
-    \externalpage http://developer.qt.nokia.com/elearning/watch/widgets_part_2_layout_management
-    \title Qt Essentials - Widgets part 2
-*/
-/*!
-    \externalpage http://developer.qt.nokia.com/elearning/watch/widgets_part_3_guidelines_for_custom_widgets
-    \title Qt Essentials - Widgets part 3
-*/
-/*!
-    \externalpage http://developer.qt.nokia.com/elearning/watch/graphics_view_part_1_using_graphicsview_classes
-    \title Qt Essentials - Graphics View part 1
-*/
-/*!
-    \externalpage http://developer.qt.nokia.com/elearning/watch/graphics_view_part_2_transformations_and_coordinate_systems
-    \title Qt Essentials - Graphics View part 2
-*/
-/*!
-    \externalpage http://developer.qt.nokia.com/elearning/watch/graphics_view_part_3_creating_custom_items
-    \title Qt Essentials - Graphics View part 3
-*/
-/*!
-    \externalpage http://developer.qt.nokia.com/elearning/watch/model_view_part_1_model_view_concept
-    \title Qt Essentials - Model/View I part 1
-*/
-/*!
-    \externalpage http://developer.qt.nokia.com/elearning/watch/model_view_part_2_showing_simple_data
-    \title Qt Essentials - Model/View I part 2
-*/
-/*!
-    \externalpage http://developer.qt.nokia.com/elearning/watch/model_view_part_3_proxy_models
-    \title Qt Essentials - Model/View I part 3
-*/
-/*!
-    \externalpage http://developer.qt.nokia.com/elearning/watch/model_view_part_4_custom_models
-    \title Qt Essentials - Model/View I part 4
-*/
-/*!
-    \externalpage http://developer.qt.nokia.com/elearning/watch/model_view_ii_part_1_editing_item_data
-    \title Qt Essentials - Model/View II part 1
-*/
-/*!
-    \externalpage
-    \title Qt Essentials - Model/View II part 2
-*/
-/*!
-    \externalpage http://developer.qt.nokia.com/elearning/watch/model_view_ii_part_3_data_widget_mapper
-    \title Qt Essentials - Model/View II part 3
-*/
-/*!
-    \externalpage http://developer.qt.nokia.com/elearning/watch/model_view_ii_part_4_custom_tree_model
-    \title Qt Essentials - Model/View II part 4
-*/
-/*!
-    \externalpage http://developer.qt.nokia.com/elearning/watch/model_view_ii_part_5_drag_and_drop
-    \title Qt Essentials - Model/View II part 5
-*/
-/*!
-    \externalpage http://qt.nokia.com/certification
+    \externalpage http://qt.digia.com/Product/Learning/Certification/
     \title Qt Certification
 */
 /*!
-    \externalpage http://qt.nokia.com/developer/learning/certification/exams/preparation-prerequisites
-    \title Qt Certification Exam Preparation and Prerequisites
-*/
-
-/*!
-    \externalpage http://qt.nokia.com/developer/learning/online/training/materials
-    \title Download Qt training materials
-*/
-
-/*!
-    \externalpage http://qt.nokia.com/partners/qt-in-education/qt-in-education-course-material/
-    \title Qt in Education Course Material
-*/
-
-/*!
-    \externalpage http://developer.qt.nokia.com/
+    \externalpage http://qt-project.org
     \title Qt Developer Network
 */
 
 /*!
-    \externalpage http://developer.qt.nokia.com/wiki/Qt_Modules_Maturity_Level
+    \externalpage http://qt-project.org/wiki/Qt_Modules_Maturity_Level
     \title Qt Modules' Maturity Levels - Modules List
 */
 
 /*!
-    \externalpage http://labs.qt.nokia.com/2011/05/03/qt-modules-maturity-level/
+    \externalpage http://blog.qt.digia.com/2011/05/03/qt-modules-maturity-level/
     \title Qt Modules' Maturity Level - Description
 */
 
 /*!
-    \externalpage http://doc.qt.nokia.com/qtquick-components-symbian-1.1/index.html
+    \externalpage http://doc.qt.digia.com/qtquick-components-symbian-1.1/index.html
     \title Qt Quick Components for Symbian 1.1
 */
diff --git a/doc/src/tutorials/modelview.qdoc b/doc/src/tutorials/modelview.qdoc
index 3badd29ce3..804df17295 100644
--- a/doc/src/tutorials/modelview.qdoc
+++ b/doc/src/tutorials/modelview.qdoc
@@ -103,8 +103,8 @@
     Let's have a closer look at a standard table widget. A table widget is a 2D
     array of the data elements that the user can change. The table widget can be
     integrated into a program flow by reading and writing the data elements that
-    the table widget provides. 
-    This method is very intuitive and useful in many applications, but displaying 
+    the table widget provides.
+    This method is very intuitive and useful in many applications, but displaying
     and editing a database table with a standard table widget can be problematic.
     Two copies of the data have to be coordinated: one outside the
     widget; one inside the widget. The developer is responsible for
@@ -183,12 +183,12 @@
 
 
     \section1 2. A Simple Model/View Application
-    If you want to develop a model/view application, where should you start? 
-    We recommend starting with a simple example and extending it step-by-step. 
-    This makes understanding the architecture a lot easier. Trying to understand 
-    the model/view architecture in detail before invoking the IDE has proven 
-    to be less convenient for many developers. It is substantially easier to 
-    start with a simple model/view application that has demo data. Give it a 
+    If you want to develop a model/view application, where should you start?
+    We recommend starting with a simple example and extending it step-by-step.
+    This makes understanding the architecture a lot easier. Trying to understand
+    the model/view architecture in detail before invoking the IDE has proven
+    to be less convenient for many developers. It is substantially easier to
+    start with a simple model/view application that has demo data. Give it a
     try! Simply replace the data in the examples below with your own.
 
     Below are 7 very simple and independent applications that show different
@@ -205,7 +205,7 @@
 
     We have the usual \l {modelview-part2-main-cpp.html}{main()} function:
 
-    Here is the interesting part: We create an instance of MyModel and use 
+    Here is the interesting part: We create an instance of MyModel and use
     \l{QTableView::setModel()}{tableView.setModel(&myModel);} to pass a
     pointer of it to to \l{QTableView}{tableView}. \l{QTableView}{tableView}
     will invoke the methods of the pointer it has received to find out two
@@ -569,28 +569,6 @@
     \o \l{QItemDelegate}{QItemDelegate Class Reference}
     \endlist
 
-
-    \section2 3.5 Debugging with ModelTest
-
-    The passive nature of models provides new challenges for programmers.
-    Inconsistencies in the model can cause the application to crash. Since the
-    model is hit by numerous calls from the view, it is hard to find out which
-    call has crashed the application and which operation has introduced the
-    problem.
-
-    Qt Labs provides software called
-    \l{http://labs.qt.nokia.com/page/Projects/Itemview/Modeltest}{ModelTest},
-    which checks models while your programming is running. Every time the model
-    is changed, ModelTest scans the model and reports errors with an assert.
-    This is especially important for tree models, since their hierarchical
-    nature leaves many possibilities for subtle inconsistencies.
-
-    Unlike view classes, ModelTest uses out of range indexes to test the model.
-    This means your application may crash with ModelTest even if it runs
-    perfectly without it. So you also need to handle all of the indexes that are
-    out of range when using ModelTest.
-
-
     \section1 4. Good Sources of Additional Information
 
     \section2 4.1 Books
@@ -608,13 +586,10 @@
           Translated from \bold{Qt 4, Einführung in die Applikationsentwicklung},
           \e{Open Source Press}, ISBN 3-937514-12-0.
        \o \bold{Foundations of Qt Development} / Johan Thelin, \e{Apress}, ISBN 1-59059-831-8.
-       \o \bold{Advanced Qt Programming} / Mark Summerfield, \e{Prentice Hall}, ISBN 0-321-63590-6. 
-          This book covers Model/View programming on more than 150 pages. 
+       \o \bold{Advanced Qt Programming} / Mark Summerfield, \e{Prentice Hall}, ISBN 0-321-63590-6.
+          This book covers Model/View programming on more than 150 pages.
     \endlist
 
-    More information about these books is available on the
-    \l{Books about Qt Programming}{Qt Web site}.
-
     The following list provides an overview of example programs contained in the first three
     books listed above. Some of them make very good templates for developing similar
     applications.
diff --git a/doc/src/zh_CN/bughowto.qdoc b/doc/src/zh_CN/bughowto.qdoc
index b079d22372..787d89dafc 100644
--- a/doc/src/zh_CN/bughowto.qdoc
+++ b/doc/src/zh_CN/bughowto.qdoc
@@ -32,7 +32,7 @@
 
     如果您认为您已经发现了 Qt 的一个 bug，我们非常高兴听到这个消息，因为在此之后我们可以修复它。
 
-    在报告 bug 之前，请检查 Qt 网站中的 \l{FAQs}{FAQ}、\l{Platform Notes}{平台备注}和 \l{Qt Bug Tracker}{Qt Bug 跟踪器}确认这个问题是否已知。
+    在报告 bug 之前，请检查 Qt 网站中的 \l{Platform Notes}{平台备注}和 \l{Qt Bug Tracker}{Qt Bug 跟踪器}确认这个问题是否已知。
 
     如果您还没有 \l{Qt Bug Tracker}{Qt Bug 跟踪器}的帐号，您要做的第一件事情就是注册一个。一旦您完成了这一步，您就可以提交并且跟踪您的 bug 报告，而且在您提交之后，公众就可以看到它们。
 
@@ -44,7 +44,7 @@
     \o 您所使用的 Qt 的版本号，以及它在被编译的时候所使用的配置选项
     \o 关于如何重复这个问题的可靠并且清晰的描述
     \endlist
-   
+
     如果可能，请提供一个使用 QtTest 模块编写的测试程序，因为这样做可以加快我们重现您的这个问题的进程，并且可以让开发人员更有效率的确认这个问题。
 
     另外，如果您的问题只是在运行时可见，请尽量创建一个可以运行并且显示这个问题的小测试程序。通常，您可以在众多 Qt 实例中选择一个进行少量修改就可以实现这一目的。
diff --git a/src/gui/dialogs/qcolordialog.cpp b/src/gui/dialogs/qcolordialog.cpp
index 89b91dbdee..b5ad7d2490 100644
--- a/src/gui/dialogs/qcolordialog.cpp
+++ b/src/gui/dialogs/qcolordialog.cpp
@@ -1702,9 +1702,6 @@ static const Qt::WindowFlags DefaultWindowFlags =
     during the execution of the program. Use setCustomColor() to set
     the custom colors, and use customColor() to get them.
 
-    Additional widgets that allow users to pick colors are available
-    as \l{Qt Solutions}.
-
     The \l{dialogs/standarddialogs}{Standard Dialogs} example shows
     how to use QColorDialog as well as other built-in Qt dialogs.