aboutsummaryrefslogtreecommitdiffstats
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
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>
-rw-r--r--README6
-rw-r--r--dist/appdata.xml2
-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
-rw-r--r--src/plugins/debugger/debuggeroptionspage.cpp2
-rw-r--r--src/plugins/qnx/blackberryruncontrolfactory.cpp2
-rw-r--r--src/plugins/qnx/qnxconstants.h2
11 files changed, 14 insertions, 14 deletions
diff --git a/README b/README
index 9da0707989f..74655f93c18 100644
--- a/README
+++ b/README
@@ -43,7 +43,7 @@ versions of Qt and Qt Creator on Windows. Alternatively, to avoid having to
compile Qt yourself, you can use one of the versions of Qt shipped with the Qt
SDK (release builds of Qt using MinGW and Visual C++ 2010 or later).
For detailed information on the supported compilers, see
-http://qt-project.org/wiki/Building_Qt_5_from_Git .
+http://wiki.qt.io/Building_Qt_5_from_Git .
1. Decide which compiler to use: MinGW or Microsoft Visual Studio. If you
plan to contribute to Qt Creator, you should compile your changes with
@@ -75,7 +75,7 @@ http://qt-project.org/wiki/Building_Qt_5_from_Git .
directory.
7. Install a compiler:
- - For a MinGW toolchain for Qt, see http://qt-project.org/wiki/MinGW .
+ - For a MinGW toolchain for Qt, see http://wiki.qt.io/MinGW .
- For Microsoft Visual C++, install the Windows SDK and the "Debugging
Tools for Windows" from the SDK image. We strongly recommend using the
@@ -122,7 +122,7 @@ http://qt-project.org/wiki/Building_Qt_5_from_Git .
You have to remove it from the path.
10. You are now ready to configure and build Qt and Qt Creator.
- Please see http://qt-project.org/wiki/Building_Qt_5_from_Git for
+ Please see http://wiki.qt.io/Building_Qt_5_from_Git for
recommended configure-options for Qt 5.
To use MinGW, open the the shell prompt and enter:
diff --git a/dist/appdata.xml b/dist/appdata.xml
index 017bbf9445d..685eba7aa73 100644
--- a/dist/appdata.xml
+++ b/dist/appdata.xml
@@ -23,6 +23,6 @@
<screenshots>
<screenshot type="default" width="800" height="600">http://qt-project.org/uploads/image_upload/qtcreator-edit-mode.png</screenshot>
</screenshots>
- <url type="homepage">https://qt-project.org/wiki/Category:Tools::QtCreator</url>
+ <url type="homepage">https://wiki.qt.io/Category:Tools::QtCreator</url>
<project_group>Qt</project_group>
</application>
diff --git a/doc/api/qtcreator-documentation.qdoc b/doc/api/qtcreator-documentation.qdoc
index 8c7bbd52bde..0d9fc3d3937 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 cbb8d3db466..3ea650a4d80 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 ab99288517d..7451082423e 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 b862606cbd9..ed040f578f2 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 a99fdd1ca65..224aa40ec49 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 54274f6ac95..d7b347d2472 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}.
*/
diff --git a/src/plugins/debugger/debuggeroptionspage.cpp b/src/plugins/debugger/debuggeroptionspage.cpp
index d0b04a9b32c..b904cf50dc3 100644
--- a/src/plugins/debugger/debuggeroptionspage.cpp
+++ b/src/plugins/debugger/debuggeroptionspage.cpp
@@ -55,7 +55,7 @@ using namespace Utils;
namespace Debugger {
namespace Internal {
-static const char debuggingToolsWikiLinkC[] = "http://qt-project.org/wiki/Qt_Creator_Windows_Debugging";
+static const char debuggingToolsWikiLinkC[] = "http://wiki.qt.io/Qt_Creator_Windows_Debugging";
// -----------------------------------------------------------------------
// DebuggerItemConfigWidget
diff --git a/src/plugins/qnx/blackberryruncontrolfactory.cpp b/src/plugins/qnx/blackberryruncontrolfactory.cpp
index 84008ddd496..0a721d3c619 100644
--- a/src/plugins/qnx/blackberryruncontrolfactory.cpp
+++ b/src/plugins/qnx/blackberryruncontrolfactory.cpp
@@ -139,7 +139,7 @@ ProjectExplorer::RunControl *BlackBerryRunControlFactory::create(ProjectExplorer
if (qtVer && qtVer->qtVersion() <= QtSupport::QtVersionNumber(4, 8, 6))
Core::MessageManager::write(tr("Target Qt version (%1) might not support QML profiling. "
"Cascades applications are not affected and should work as expected. "
- "For more info see http://qt-project.org/wiki/Qt-Creator-with-BlackBerry-10")
+ "For more info see http://wiki.qt.io/Qt_Creator_with_BlackBerry_10")
.arg(qtVer->qtVersionString()), Core::MessageManager::Flash
);
diff --git a/src/plugins/qnx/qnxconstants.h b/src/plugins/qnx/qnxconstants.h
index 742091f9c77..d448808be3e 100644
--- a/src/plugins/qnx/qnxconstants.h
+++ b/src/plugins/qnx/qnxconstants.h
@@ -128,7 +128,7 @@ const char QNX_BLACKBERRY_DEFAULT_DEPLOY_QT_BASEPATH[] = "/accounts/devuser/";
const char QNX_OK_ICON[] = ":/qnx/images/ok.png";
-const char QNX_BLACKBERRY_SETUP_URL[] = "http://qt-project.org/wiki/Qt-Creator-with-BlackBerry-10";
+const char QNX_BLACKBERRY_SETUP_URL[] = "http://wiki.qt.io/Qt_Creator_with_BlackBerry_10";
const char QNX_LEGACY_KEYS_URL[] = "https://developer.blackberry.com/native/documentation/core"
"/com.qnx.doc.ide.userguide/topic/signing_and_publishing.html";
const char QNX_REGISTER_KEYS_URL[] = "https://www.blackberry.com/SignedKeys/codesigning.html";