aboutsummaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
authorSergio Ahumada <sahumada@blackberry.com>2015-03-02 14:06:12 +0100
committerSergio Ahumada <sahumada@texla.cl>2015-03-03 09:35:41 +0000
commit3af3fe7ad3e312a2923dfd18a8d527fccf5970f3 (patch)
tree5454783698069eb01c39d8ac37e05d4760cad126 /doc
parentb8db05c3ffad7fb2b46b35389cf86275c7e8c735 (diff)
Replace old qt-project.org wiki with wiki.qt.iov3.3.2
Change-Id: Ie7518d57b62e3f0b9dc6c559fe4a8f5b0212bb43 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com>
Diffstat (limited to 'doc')
-rw-r--r--doc/api/qtcreator-documentation.qdoc2
-rw-r--r--doc/src/debugger/creator-debugger-setup.qdoc2
-rw-r--r--doc/src/howto/qtcreator-faq.qdoc2
-rw-r--r--doc/src/overview/creator-tech-support.qdoc2
-rw-r--r--doc/src/qnx/creator-deployment-bb10.qdoc4
-rw-r--r--doc/src/qnx/creator-developing-bb10.qdoc2
6 files changed, 7 insertions, 7 deletions
diff --git a/doc/api/qtcreator-documentation.qdoc b/doc/api/qtcreator-documentation.qdoc
index 8c7bbd52bd..0d9fc3d393 100644
--- a/doc/api/qtcreator-documentation.qdoc
+++ b/doc/api/qtcreator-documentation.qdoc
@@ -131,7 +131,7 @@
\section1 Writing Text
Follow the guidelines for
- \l{http://qt-project.org/wiki/Writing_Qt_Documentation}
+ \l{http://wiki.qt.io/Writing_Qt_Documentation}
{writing Qt documentation}.
The documentation must be grammatically correct English and use the standard
diff --git a/doc/src/debugger/creator-debugger-setup.qdoc b/doc/src/debugger/creator-debugger-setup.qdoc
index cbb8d3db46..3ea650a4d8 100644
--- a/doc/src/debugger/creator-debugger-setup.qdoc
+++ b/doc/src/debugger/creator-debugger-setup.qdoc
@@ -181,7 +181,7 @@
versions of MinGW. On most Linux distributions the GDB
builds shipped with the system are sufficient. You can
also build your own. Follow the instructions in
- \l{http://qt-project.org/wiki/QtCreatorBuildGdb}
+ \l{http://wiki.qt.io/QtCreator_Build_Gdb}
{Building GDB}.
Builds of GDB shipped with Xcode on OS X are no longer
supported.
diff --git a/doc/src/howto/qtcreator-faq.qdoc b/doc/src/howto/qtcreator-faq.qdoc
index ab99288517..7451082423 100644
--- a/doc/src/howto/qtcreator-faq.qdoc
+++ b/doc/src/howto/qtcreator-faq.qdoc
@@ -191,7 +191,7 @@
installed when you install \QC and \QSDK. On OS X, GDB is no longer
officially supported. To build your own Python-enabled GDB, follow the
instructions in
- \l{http://qt-project.org/wiki/QtCreatorBuildGdb}{Building GDB}.
+ \l{http://wiki.qt.io/QtCreator_Build_Gdb}{Building GDB}.
You must use Python version 2.6 or 2.7.
diff --git a/doc/src/overview/creator-tech-support.qdoc b/doc/src/overview/creator-tech-support.qdoc
index b862606cbd..ed040f578f 100644
--- a/doc/src/overview/creator-tech-support.qdoc
+++ b/doc/src/overview/creator-tech-support.qdoc
@@ -41,7 +41,7 @@
\row
\li Learn more about Qt
- \li \l{http://qt-project.org/wiki/developer-guides}
+ \li \l{http://wiki.qt.io/developer_guides}
{Qt Developer Guides}
\row
diff --git a/doc/src/qnx/creator-deployment-bb10.qdoc b/doc/src/qnx/creator-deployment-bb10.qdoc
index a99fdd1ca6..224aa40ec4 100644
--- a/doc/src/qnx/creator-deployment-bb10.qdoc
+++ b/doc/src/qnx/creator-deployment-bb10.qdoc
@@ -84,7 +84,7 @@
filter, so you need to set this filter in the top-right corner of the
\uicontrol {New} dialog to enable those templates.
- \note Currently, the BlackBerry 10 devices and Simulator have Qt 4.8 libraries preinstalled. To use Qt 5 features, you must compile the Qt libraries for BlackBerry 10 yourself. For more information, see \l {http://qt-project.org/wiki/Building-Qt5-for-Blackberry}{http://qt-p roject.org/wiki/Building-Qt5-for-Blackberry}.
+ \note Currently, the BlackBerry 10 devices and Simulator have Qt 4.8 libraries preinstalled. To use Qt 5 features, you must compile the Qt libraries for BlackBerry 10 yourself. For more information, see \l {http://wiki.qt.io/Building_Qt5_for_Blackberry}{Building Qt5 for BlackBerry}.
- For more details please refer to the Qt-Project wiki page: \l {http://qt-project.org/wiki/BlackBerry} {http://qt-project.org/wiki/BlackBerry}.
+ For more details please refer to the Qt-Project wiki page: \l {http://wiki.qt.io/BlackBerry}{Qt for BlackBerry}.
*/
diff --git a/doc/src/qnx/creator-developing-bb10.qdoc b/doc/src/qnx/creator-developing-bb10.qdoc
index 54274f6ac9..d7b347d247 100644
--- a/doc/src/qnx/creator-developing-bb10.qdoc
+++ b/doc/src/qnx/creator-developing-bb10.qdoc
@@ -120,5 +120,5 @@
\include qnx/creator-key-management-qnx.qdocinc
- For more details please refer to the Qt-Project wiki page: \l {http://qt-project.org/wiki/BlackBerry} {http://qt-project.org/wiki/BlackBerry}.
+ For more details please refer to the Qt-Project wiki page: \l {http://wiki.qt.io/BlackBerry}{Qt for BlackBerry}.
*/