Adapt documentation URL

Change-Id: I74963a9d4a729450341f4f7a4ae5b3583654ffb8
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com>

13 files changed, 25 insertions, 25 deletions

diff --git a/dist/known-issues b/dist/known-issues
index 33275b3197..fd4935d062 100644
--- a/dist/known-issues
+++ b/dist/known-issues
@@ -1,6 +1,6 @@
 The Qt Creator Manual lists known issues in Qt Creator:
 
-http://qt-project.org/doc/qtcreator/creator-known-issues.html
+http://doc.qt.io/qtcreator/creator-known-issues.html
 
 For a complete list of reported issues, see the Qt Bug Tracker:
 
diff --git a/doc/api/coding-style.qdoc b/doc/api/coding-style.qdoc
index c667788c94..caf33b2d0a 100644
--- a/doc/api/coding-style.qdoc
+++ b/doc/api/coding-style.qdoc
@@ -896,7 +896,7 @@
             does not have signals or slots, if it is intended to be used
             with qobject_cast<>. See also \l{Casting}.
         \li Normalize the arguments for signals and slots
-            (see \l{http://qt-project.org/doc/qt-4.8/qmetaobject.html#normalizedSignature}{QMetaObject::normalizedSignature}
+            (see QMetaObject::normalizedSignature)
             inside connect statements
             to safely make signal and slot lookup a few cycles faster.
             You can use $QTDIR/util/normalize to normalize existing code.
diff --git a/doc/api/first-plugin.qdoc b/doc/api/first-plugin.qdoc
index 2da093f03f..2684271b48 100644
--- a/doc/api/first-plugin.qdoc
+++ b/doc/api/first-plugin.qdoc
@@ -227,7 +227,7 @@
     for use in \QC, by using the information you gave above.
 
     For more information about qmake, and writing .pro files in general,
-    see the \l{http://qt-project.org/doc/qt-4.8/qmake-manual.html}{qmake Manual}.
+    see the \l{qmake Manual}.
 
     \section1 Plugin Meta Data Template
 
diff --git a/doc/api/qtcreator-dev-wizards.qdoc b/doc/api/qtcreator-dev-wizards.qdoc
index 5974cf43f2..b9b9aabdae 100644
--- a/doc/api/qtcreator-dev-wizards.qdoc
+++ b/doc/api/qtcreator-dev-wizards.qdoc
@@ -23,7 +23,7 @@
     \section1 Introduction
 
     If the functionality provided by template-based
-    \l{http://doc.qt.digia.com/qtcreator-snapshot/creator-project-wizards.html}{custom wizards}
+    \l{http://doc.qt.io/qtcreator/creator-project-wizards.html}{custom wizards}
     is not sufficient for your case, you can write wizards in code.
 
     A wizard in Qt Creator is an instance of a class implementing
diff --git a/doc/api/qtcreator-dev.qdoc b/doc/api/qtcreator-dev.qdoc
index 8352da37ac..094cc3915a 100644
--- a/doc/api/qtcreator-dev.qdoc
+++ b/doc/api/qtcreator-dev.qdoc
@@ -53,7 +53,7 @@
     to which you can add your own snippets.
 
     \list
-    \li \l{http://doc.qt.digia.com/qtcreator/creator-completing-code.html#editing-code-snippets}
+    \li \l{http://doc.qt.io/qtcreator/creator-completing-code.html#editing-code-snippets}
          {Snippets User Interface}
     \li \l{Snippets} {Adding Snippets Groups}
     \endlist
@@ -64,7 +64,7 @@
     own
     file and project templates by writing XML definition files for them.
     \list
-    \li \l{http://doc.qt.digia.com/qtcreator/creator-project-wizards.html}
+    \li \l{http://doc.qt.io/qtcreator/creator-project-wizards.html}
          {Adding New Custom Wizards}
     \li \l{User Interface Text Guidelines}
     \endlist
@@ -96,7 +96,7 @@
     the MIME type definitions in Qt Creator to your specific setup,
     by adding or removing file extensions and specifying magic headers.
     \list
-    \li \l{http://doc.qt.digia.com/qtcreator/creator-mime-types.html}
+    \li \l{http://doc.qt.io/qtcreator/creator-mime-types.html}
          {Editing MIME Types}
     \li \l{http://standards.freedesktop.org/shared-mime-info-spec/shared-mime-info-spec-latest.html}
          {MIME Type Specification Files}
@@ -110,7 +110,7 @@
     provided by the Kate Editor. You can download highlight definition files
     for use with Qt Creator and create your own definition files.
     \list
-    \li \l{http://doc.qt.digia.com/qtcreator/creator-editor-options.html#generic-highlighting}
+    \li \l{http://doc.qt.io/qtcreator/creator-editor-options.html#generic-highlighting}
          {Generic Highlighting}
     \li \l{http://kate-editor.org/2005/03/24/writing-a-syntax-highlighting-file/}
          {Writing a Syntax Highlighting File}
@@ -162,7 +162,7 @@
     to fill a feature suggestion.
     The tool descriptions are saved as XML files that you can share.
     \list
-    \li \l{http://doc.qt.digia.com/qtcreator/creator-editor-external.html}
+    \li \l{http://doc.qt.io/qtcreator/creator-editor-external.html}
          {Using External Tools}
     \li \l{External Tool Specification Files}
     \endlist
@@ -189,7 +189,7 @@
     If you need a way to configure the tool in Qt Creator, you can add an
     \uicontrol Options page for it.
     \list
-    \li \l{http://doc.qt.digia.com/qtcreator/creator-editor-external.html}
+    \li \l{http://doc.qt.io/qtcreator/creator-editor-external.html}
          {Using External Tools}
     \li \l{External Tool Specification Files}
     \li \l{Creating Plugins}
@@ -214,7 +214,7 @@
     the \uicontrol {Issues} output
     pane.
     \list
-    \li \l{http://doc.qt.digia.com/qtcreator/creator-task-lists.html}
+    \li \l{http://doc.qt.io/qtcreator/creator-task-lists.html}
          {Showing Task List Files in the Issues Pane}
     \li \l{Creating Plugins}
     \li \l{Qt Creator Coding Rules}
diff --git a/doc/api/qtcreator-documentation.qdoc b/doc/api/qtcreator-documentation.qdoc
index 32cb491f58..8c7bbd52bd 100644
--- a/doc/api/qtcreator-documentation.qdoc
+++ b/doc/api/qtcreator-documentation.qdoc
@@ -61,7 +61,7 @@
     \section1 Configuring the Documentation Project
 
     \QC documentation is written by using QDoc. For more information about using
-    QDoc, see the \l{http://qt-project.org/doc/qt-5.1/qdoc/qdoc-index.html}
+    QDoc, see the \l{http://doc.qt.io/qt-5/qdoc-index.html}
     {QDoc Manual}.
 
     QDoc finds the new topics automatically, when you place them as .qdoc files
@@ -299,7 +299,7 @@
     on OS X. You can view the HTML files in a browser and the help files in
     the \QC \uicontrol Help mode. For more information about adding the help files to
     \QC, see
-    \l{http://qt-project.org/doc/qtcreator/creator-help.html#adding-external-documentation}
+    \l{http://doc.qt.io/qtcreator/creator-help.html#adding-external-documentation}
     {Adding External Documentation}.
 
     Besides \c docs, you have the following options:
diff --git a/doc/config/qtcreator-project.qdocconf b/doc/config/qtcreator-project.qdocconf
index 7764b14868..0cbfa5740f 100644
--- a/doc/config/qtcreator-project.qdocconf
+++ b/doc/config/qtcreator-project.qdocconf
@@ -1,6 +1,6 @@
 project     = "QtCreator"
 description = "Qt Creator Manual"
-url         = http://qt-project.org/doc/qtcreator
+url         = http://doc.qt.io/qtcreator
 
 headerdirs =
 sourcedirs = $SRCDIR/src
diff --git a/doc/src/projects/creator-projects-qbs.qdoc b/doc/src/projects/creator-projects-qbs.qdoc
index ebcf8aefd3..f02d1fa8ea 100644
--- a/doc/src/projects/creator-projects-qbs.qdoc
+++ b/doc/src/projects/creator-projects-qbs.qdoc
@@ -27,7 +27,7 @@
     To use Qbs to build a project, you must create a .qbs file for the project.
     You can use \QC to create a C or C++ project that is built with Qbs.
     For more information about Qbs, see
-    the \l{http://qt-project.org/doc/qbs/index.html}{Qbs Manual}.
+    the \l{http://doc.qt.io/qbs/index.html}{Qbs Manual}.
 
     \section1 Building Qbs
 
@@ -89,7 +89,7 @@
                 \li In the \uicontrol Properties field, specify the properties to pass
                     to the project. Use colons (:) to separate keys from values.
                     For more information, see
-                    \l{http://qt-project.org/doc/qbs/language-introduction.html}
+                    \l{http://doc.qt.io/qbs/language-introduction.html}
                     {Modules} in the Qbs Manual.
 
                 \li In the \uicontrol Flags field:
diff --git a/doc/src/projects/creator-projects-settings-build.qdoc b/doc/src/projects/creator-projects-settings-build.qdoc
index 51066862cf..4c84c2c7f9 100644
--- a/doc/src/projects/creator-projects-settings-build.qdoc
+++ b/doc/src/projects/creator-projects-settings-build.qdoc
@@ -114,7 +114,7 @@
     the build step and add a custom build step that specifies another shell
     command.
 
-    \QC is integrated to \l{http://doc.qt.digia.com/QtQuickCompiler/}
+    \QC is integrated to \l{http://doc.qt.io/QtQuickCompiler/}
     {Qt Quick Compiler} (commercial only) that enables you to compile QML source
     code into the final binary. This
     improves the startup time of the application and eliminates the need to
diff --git a/share/qtcreator/debugger/personaltypes.py b/share/qtcreator/debugger/personaltypes.py
index d3f2d61e78..8eaf20d1ec 100644
--- a/share/qtcreator/debugger/personaltypes.py
+++ b/share/qtcreator/debugger/personaltypes.py
@@ -58,7 +58,7 @@
 #            with SubItem(d, "data")
 #                d.putItem("data", value["data"])
 
-# Check http://qt-project.org/doc/qtcreator-3.2/creator-debugging-helpers.html
+# Check http://doc.qt.io/qtcreator/creator-debugging-helpers.html
 # for more details or look at qttypes.py, stdtypes.py, boosttypes.py
 # for more complex examples.
 
diff --git a/share/qtcreator/welcomescreen/widgets/dummydata/context/ExampleDelegate.qml b/share/qtcreator/welcomescreen/widgets/dummydata/context/ExampleDelegate.qml
index 8784151f1e..f17c790838 100644
--- a/share/qtcreator/welcomescreen/widgets/dummydata/context/ExampleDelegate.qml
+++ b/share/qtcreator/welcomescreen/widgets/dummydata/context/ExampleDelegate.qml
@@ -35,6 +35,6 @@ DummyContextObject {
     property variant model: QtObject {
         property string name: "Calculator"
         property string description: "his demo shows how to write a simple calculator application in QML and JavaScript."
-        property string imageSource: "http://qt-project.org/doc/qt-4.8/images/qml-calculator-example-small.png"
+        property string imageSource: "http://doc.qt.io/qt-4.8/images/qml-calculator-example-small.png"
     }
 }
diff --git a/share/qtcreator/welcomescreen/widgets/dummydata/examplesModel.qml b/share/qtcreator/welcomescreen/widgets/dummydata/examplesModel.qml
index ff1596dd49..f730111a07 100644
--- a/share/qtcreator/welcomescreen/widgets/dummydata/examplesModel.qml
+++ b/share/qtcreator/welcomescreen/widgets/dummydata/examplesModel.qml
@@ -34,27 +34,27 @@ ListModel {
     ListElement {
         name: "Calculator with more info on something bla bla on Qt if you know"
         description: "his demo shows how to write a simple calculator application in QML and JavaScript."
-        imageSource: "http://qt-project.org/doc/qt-4.8/images/qml-calculator-example-small.png"
+        imageSource: "http://doc.qt.io/qt-4.8/images/qml-calculator-example-small.png"
     }
     ListElement {
         name: "RSS News Reader"
         description: "This demo shows how to write a RSS news reader in QML."
-        imageSource: "http://qt-project.org/doc/qt-4.8/images/qml-rssnews-demo-small.png"
+        imageSource: "http://doc.qt.io/qt-4.8/images/qml-rssnews-demo-small.png"
     }
     ListElement {
         name: "Twitter"
         description: "This demo shows how to write a mobile Twitter search client in QML. Use it to see what people think about Qt Quick!"
-        imageSource: "http://qt-project.org/doc/qt-4.8/images/qml-twitter-demo-small.png"
+        imageSource: "http://doc.qt.io/qt-4.8/images/qml-twitter-demo-small.png"
     }
     ListElement {
         name: "Basic Drawing Example"
         description: "The Basic Drawing example shows how to display basic graphics primitives in a variety of styles using the QPainter class."
-        imageSource: "http://qt-project.org/doc/qt-4.8/images/basicdrawing-example.png"
+        imageSource: "http://doc.qt.io/qt-4.8/images/basicdrawing-example.png"
     }
 
     ListElement {
         name: "Border Layout Example"
         description: "The Border Layout example shows how to create a custom layout that arranges child widgets according to a simple set of rules. The Border Layout example shows how to create a custom layout that arranges child widgets according to a simple set of rules. The Border Layout example shows how to create a custom layout that arranges child widgets according to a simple set of rules. The Border Layout example shows how to create a custom layout that arranges child widgets according to a simple set of rules."
-        imageSource: "http://qt-project.org/doc/qt-4.8/images/borderlayout-example.png"
+        imageSource: "http://doc.qt.io/qt-4.8/images/borderlayout-example.png"
     }
 }
diff --git a/src/plugins/help/helpplugin.cpp b/src/plugins/help/helpplugin.cpp
index 59787ffa6e..c8303219b0 100644
--- a/src/plugins/help/helpplugin.cpp
+++ b/src/plugins/help/helpplugin.cpp
@@ -637,7 +637,7 @@ void HelpPlugin::handleHelpRequest(const QUrl &url, Core::HelpManager::HelpViewe
             || address.startsWith(QLatin1String("qthelp://com.nokia."))
             || address.startsWith(QLatin1String("qthelp://com.trolltech."))) {
                 // local help not installed, resort to external web help
-                QString urlPrefix = QLatin1String("http://qt-project.org/doc/");
+                QString urlPrefix = QLatin1String("http://doc.qt.io/");
                 if (url.authority() == QLatin1String("org.qt-project.qtcreator"))
                     urlPrefix.append(QString::fromLatin1("qtcreator"));
                 else