summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSergio Ahumada <sahumada@blackberry.com>2015-02-26 16:42:10 +0100
committerSergio Ahumada <sahumada@texla.cl>2015-02-27 09:27:13 +0000
commite78643dc0a9e276480afa5de98006c4979fb0125 (patch)
treed44fa8932e7bc91e6df6284670604629d752d7d9
parenta782369071db1d89448c0b94248d31fa877bcf8c (diff)
Replace old qt-project.org wiki with wiki.qt.io
Change-Id: If6c05a5b1f60e97c64f3d6b64041a84c3af82964 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
-rw-r--r--dist/README4
-rw-r--r--doc/README2
-rw-r--r--doc/global/externalsites/qt-webpages.qdoc12
-rw-r--r--doc/global/html-footer-online.qdocconf4
-rw-r--r--doc/global/html-header-online.qdocconf2
-rw-r--r--mkspecs/devices/linux-arm-trident-pnx8473-g++/qmake.conf2
-rw-r--r--mkspecs/devices/linux-rasp-pi-g++/qmake.conf2
-rw-r--r--mkspecs/devices/linux-sh4-stmicro-ST7108-g++/qmake.conf2
-rw-r--r--mkspecs/devices/linux-sh4-stmicro-ST7540-g++/qmake.conf2
-rw-r--r--mkspecs/devices/linux-snowball-g++/qmake.conf2
-rw-r--r--mkspecs/features/qt_headersclean.prf2
-rw-r--r--mkspecs/modules/README2
-rw-r--r--src/widgets/doc/src/modelview.qdoc2
13 files changed, 20 insertions, 20 deletions
diff --git a/dist/README b/dist/README
index 6332d12c34..f0d2034001 100644
--- a/dist/README
+++ b/dist/README
@@ -13,7 +13,7 @@ http://qt-project.org
Be sure to check out the release notes, which will list any known
problems or limitations of this version:
-http://qt-project.org/wiki/Category:Release
+https://wiki.qt.io/?title=Category:Release
Overview
@@ -101,7 +101,7 @@ Building Qt 5 from Source
-------------------------
See <install_dir>/<version>/src/README and
-http://qt-project.org/wiki/Building-Qt-5-from-Git
+http://wiki.qt.io/?title=Building_Qt_5_from_Git
for instructions on building Qt from source.
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" \
diff --git a/mkspecs/devices/linux-arm-trident-pnx8473-g++/qmake.conf b/mkspecs/devices/linux-arm-trident-pnx8473-g++/qmake.conf
index 011fc6fe28..a546a3ae18 100644
--- a/mkspecs/devices/linux-arm-trident-pnx8473-g++/qmake.conf
+++ b/mkspecs/devices/linux-arm-trident-pnx8473-g++/qmake.conf
@@ -1,7 +1,7 @@
#
# qmake configuration for building with arm-linux-uclibcgnueabi-g++
#
-# http://wiki.qt-project.org/Devices/Shiner
+# http://wiki.qt.io/?title=Shiner
#
MAKEFILE_GENERATOR = UNIX
diff --git a/mkspecs/devices/linux-rasp-pi-g++/qmake.conf b/mkspecs/devices/linux-rasp-pi-g++/qmake.conf
index 6537d457ab..38e4b36cdd 100644
--- a/mkspecs/devices/linux-rasp-pi-g++/qmake.conf
+++ b/mkspecs/devices/linux-rasp-pi-g++/qmake.conf
@@ -1,6 +1,6 @@
#
# qmake configuration for Broadcom's Raspberry PI
-# http://wiki.qt-project.org/Devices/RaspberryPi
+# http://wiki.qt.io/?title=RaspberryPi
include(../common/linux_device_pre.conf)
diff --git a/mkspecs/devices/linux-sh4-stmicro-ST7108-g++/qmake.conf b/mkspecs/devices/linux-sh4-stmicro-ST7108-g++/qmake.conf
index 932b4d7fa7..dc2b28a180 100644
--- a/mkspecs/devices/linux-sh4-stmicro-ST7108-g++/qmake.conf
+++ b/mkspecs/devices/linux-sh4-stmicro-ST7108-g++/qmake.conf
@@ -1,7 +1,7 @@
#
# qmake configuration for linux-g++ using the sh4-linux-g++ crosscompiler
#
-# http://wiki.qt-project.org/Devices/ST7108
+# http://wiki.qt.io/?title=ST7108
#
MAKEFILE_GENERATOR = UNIX
diff --git a/mkspecs/devices/linux-sh4-stmicro-ST7540-g++/qmake.conf b/mkspecs/devices/linux-sh4-stmicro-ST7540-g++/qmake.conf
index 8bf2f63b04..9c28dd52c9 100644
--- a/mkspecs/devices/linux-sh4-stmicro-ST7540-g++/qmake.conf
+++ b/mkspecs/devices/linux-sh4-stmicro-ST7540-g++/qmake.conf
@@ -1,7 +1,7 @@
#
# qmake configuration for linux-g++ using the sh4-linux-g++ crosscompiler
#
-# http://wiki.qt-project.org/Devices/ST7540
+# http://wiki.qt.io/?title=ST7540
#
MAKEFILE_GENERATOR = UNIX
diff --git a/mkspecs/devices/linux-snowball-g++/qmake.conf b/mkspecs/devices/linux-snowball-g++/qmake.conf
index ebad2bfd27..99b9dc07f5 100644
--- a/mkspecs/devices/linux-snowball-g++/qmake.conf
+++ b/mkspecs/devices/linux-snowball-g++/qmake.conf
@@ -1,6 +1,6 @@
#
# qmake configuration for ST Ericsson's Snowball
-# http://qt-project.org/wiki/Snowball
+# http://wiki.qt.io/?title=Snowball
MAKEFILE_GENERATOR = UNIX
CONFIG += incremental
diff --git a/mkspecs/features/qt_headersclean.prf b/mkspecs/features/qt_headersclean.prf
index 0650adfe5e..aae8d7c707 100644
--- a/mkspecs/features/qt_headersclean.prf
+++ b/mkspecs/features/qt_headersclean.prf
@@ -7,7 +7,7 @@
*-g++*: QMAKE_CXXFLAGS += -W -Wall -Wextra -Werror
-# The flags here come from http://wiki.qt-project.org/Coding_Conventions#Conventions_for_public_header_files
+# The flags here come from http://wiki.qt.io/?title=Coding_Conventions#Conventions_for_public_header_files
# -Wold-style-cast cannot be used, /usr/include/bits/byteswap.h defines the macro bswap_16 using C style casts :(
# -Wfloat-equal cannot be used, qrect.h and qvector2d.h do exact comparisons in isNull and operator==. Would need #pragmas.
*-g++*: QMAKE_CXXFLAGS += -Woverloaded-virtual -Wshadow -Wundef
diff --git a/mkspecs/modules/README b/mkspecs/modules/README
index 198bd868e0..9ce22005d3 100644
--- a/mkspecs/modules/README
+++ b/mkspecs/modules/README
@@ -1,3 +1,3 @@
Qt modules need to drop a qmake file here to become part of the current
Qt configuration. The file format is documented in
-http://wiki.qt-project.org/Creating_a_new_module_or_tool_for_Qt#The_qt_.3Cmodule.3E.pri_files
+http://wiki.qt.io/?title=Creating_a_new_module_or_tool_for_Qt#The_qt_.3Cmodule.3E.pri_files
diff --git a/src/widgets/doc/src/modelview.qdoc b/src/widgets/doc/src/modelview.qdoc
index 3b33e21ec2..31a24204fe 100644
--- a/src/widgets/doc/src/modelview.qdoc
+++ b/src/widgets/doc/src/modelview.qdoc
@@ -576,7 +576,7 @@
problem.
Qt Labs provides software called
- \l{http://qt-project.org/wiki/Model_Test}{ModelTest},
+ \l{http://wiki.qt.io/?title=Model_Test}{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