From e78643dc0a9e276480afa5de98006c4979fb0125 Mon Sep 17 00:00:00 2001
From: Sergio Ahumada <sahumada@blackberry.com>
Date: Thu, 26 Feb 2015 16:42:10 +0100
Subject: Replace old qt-project.org wiki with wiki.qt.io

Change-Id: If6c05a5b1f60e97c64f3d6b64041a84c3af82964
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
---
 doc/README                                |  2 +-
 doc/global/externalsites/qt-webpages.qdoc | 12 ++++++------
 doc/global/html-footer-online.qdocconf    |  4 ++--
 doc/global/html-header-online.qdocconf    |  2 +-
 4 files changed, 10 insertions(+), 10 deletions(-)

(limited to 'doc')

diff --git a/doc/README b/doc/README
index 355f61d353..a00256d195 100644
--- a/doc/README
+++ b/doc/README
@@ -106,4 +106,4 @@ More Information
 ================
 
 For more information about Qt 5's documentation, refer to the Qt Project wiki:
-http://qt-project.org/wiki/Qt5DocumentationProject
+http://wiki.qt.io/?title=Qt5DocumentationProject
diff --git a/doc/global/externalsites/qt-webpages.qdoc b/doc/global/externalsites/qt-webpages.qdoc
index bc8569f7bd..ec704cec62 100644
--- a/doc/global/externalsites/qt-webpages.qdoc
+++ b/doc/global/externalsites/qt-webpages.qdoc
@@ -58,7 +58,7 @@
 */
 
 /*!
-    \externalpage http://qt-project.org/wiki/Qt_Coding_Style
+    \externalpage http://wiki.qt.io/?title=Qt_Coding_Style
     \title Qt Coding Style
 */
 /*!
@@ -78,16 +78,16 @@
     \title Pimp my video
 */
 /*!
-    \externalpage http://qt-project.org/wiki/QtMediaHub
+    \externalpage http://wiki.qt.io/?title=QtMediaHub
     \title QtMediaHub
 */
 /*!
-    \externalpage http://qt-project.org/wiki/Qt-RaspberryPi
+    \externalpage http://wiki.qt.io/?title=Qt_RaspberryPi
     \title QtonPi
 */
 
 /*!
-    \externalpage http://qt-project.org/wiki/jom
+    \externalpage http://wiki.qt.io/?title=jom
     \title jom
 */
 
@@ -102,11 +102,11 @@
 */
 
 /*!
-    \externalpage http://qt-project.org/wiki/Qt-Localization
+    \externalpage http://wiki.qt.io/?title=Qt_Localization
     \title external: Translating Qt Into Other Languages
 */
 
 /*!
-    \externalpage http://qt-project.org/wiki/BlackBerry
+    \externalpage http://wiki.qt.io/?title=BlackBerry
     \title Qt for BlackBerry
 */
diff --git a/doc/global/html-footer-online.qdocconf b/doc/global/html-footer-online.qdocconf
index 8487ee187c..6b3ea82968 100644
--- a/doc/global/html-footer-online.qdocconf
+++ b/doc/global/html-footer-online.qdocconf
@@ -36,9 +36,9 @@ HTML.footer += \
     "    <li id=\"menu-item-1365\" class=\"menu-item menu-item-type-custom menu-item-object-custom menu-item-1365\"><a href=\"http://doc.qt.io/\">Documentation</a></li>\n" \
     "    <li id=\"menu-item-1364\" class=\"menu-item menu-item-type-custom menu-item-object-custom menu-item-1364\"><a href=\"http://doc.qt.io/qt-5/qtexamplesandtutorials.html\">Examples &amp; Tutorials</a></li>\n" \
     "    <li id=\"menu-item-1363\" class=\"menu-item menu-item-type-custom menu-item-object-custom menu-item-1363\"><a href=\"http://doc.qt.io/qt-5/topics-app-development.html\">Tools</a></li>\n" \
-    "    <li id=\"menu-item-1361\" class=\"menu-item menu-item-type-custom menu-item-object-custom menu-item-1361\"><a href=\"http://qt-project.org/wiki\">Wiki</a></li>\n" \
+    "    <li id=\"menu-item-1361\" class=\"menu-item menu-item-type-custom menu-item-object-custom menu-item-1361\"><a href=\"http://wiki.qt.io/\">Wiki</a></li>\n" \
     "    <li id=\"menu-item-1360\" class=\"menu-item menu-item-type-custom menu-item-object-custom menu-item-1360\"><a href=\"http://qt-project.org/forums\">Forums</a></li>\n" \
-    "    <li id=\"menu-item-1362\" class=\"menu-item menu-item-type-custom menu-item-object-custom menu-item-1362\"><a href=\"http://qt-project.org/wiki/Qt-Contribution-Guidelines\">Contribute to Qt</a></li>\n" \
+    "    <li id=\"menu-item-1362\" class=\"menu-item menu-item-type-custom menu-item-object-custom menu-item-1362\"><a href=\"http://wiki.qt.io/?title=Qt_Contribution_Guidelines\">Contribute to Qt</a></li>\n" \
     "</ul>\n" \
     "</li>\n" \
     "<li id=\"menu-item-1347\" class=\"menu-item menu-item-type-post_type menu-item-object-page current-menu-ancestor current-menu-parent current_page_parent current_page_ancestor menu-item-has-children menu-item-1347\"><a href=\"http://qt.io/services/\">Services</a>\n" \
diff --git a/doc/global/html-header-online.qdocconf b/doc/global/html-header-online.qdocconf
index b33defccfe..b7fa9e1a65 100644
--- a/doc/global/html-header-online.qdocconf
+++ b/doc/global/html-header-online.qdocconf
@@ -114,7 +114,7 @@ HTML.postheader = \
     "<div class=\"main-rounded\">\n" \
     "<div class=\"navigationbar\">\n" \
     "    <ul class=\"sub-navigation\">\n" \
-    "        <li><a href=\"http://qt-project.org/wiki\">Wiki</a></li>\n" \
+    "        <li><a href=\"http://wiki.qt.io/\">Wiki</a></li>\n" \
     "        <li><a href=\"http://doc.qt.io/\" class=\"active\">Documentation</a></li>\n" \
     "        <li><a href=\"http://qt-project.org/forums\">Forum</a></li>\n" \
     "        <li><a href=\"https://bugreports.qt.io/\">Bug Reports</a></li>\n" \
-- 
cgit v1.2.3