summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergio Ahumada <sahumada@blackberry.com>2015-03-03 11:00:33 +0100
committerSergio Ahumada <sahumada@texla.cl>2015-03-03 12:12:03 +0000
commit8f4dc7ba2771dd7cf84c2849750d4a3ee8708b15 (patch)
treead2153d9ed5ac0814e614be13db4a9606abdef6b
parenta1d2fd7b203310a16e900a7fc0dfd6164698f6d3 (diff)
downloadqtdoc-8f4dc7ba2771dd7cf84c2849750d4a3ee8708b15.tar.gz
Adjust wiki links to the new redirect
it looks nicer this way Change-Id: If13b98e58bcba8efbeb7c306e2de43554611e6b3 Reviewed-by: Topi Reiniƶ <topi.reinio@digia.com>
-rw-r--r--README2
-rw-r--r--doc/src/configure.qdoc6
-rw-r--r--doc/src/examples.qdoc2
-rw-r--r--doc/src/external-resources.qdoc10
-rw-r--r--doc/src/platforms/blackberry.qdoc6
-rw-r--r--doc/src/platforms/ios.qdoc4
-rw-r--r--doc/src/platforms/platform-notes-rtos.qdoc4
-rw-r--r--doc/src/source-breaks.qdoc2
8 files changed, 18 insertions, 18 deletions
diff --git a/README b/README
index 7278532f..372190cc 100644
--- a/README
+++ b/README
@@ -91,4 +91,4 @@ Section 4 Packaging the Documentation
Section 5 More Information
For more information about Qt 5's documentation, refer to the Qt Project wiki:
-http://wiki.qt.io/?title=Qt5DocumentationProject
+http://wiki.qt.io/Qt5DocumentationProject
diff --git a/doc/src/configure.qdoc b/doc/src/configure.qdoc
index 7c8c8b84..e80838ae 100644
--- a/doc/src/configure.qdoc
+++ b/doc/src/configure.qdoc
@@ -220,7 +220,7 @@
\li \c -xplatform - the target platform. Valid xplatform options are the same
as the \c -platform options which are found in \e{qtbase/mkspecs}.
\li \c -device - a specific device or chipsets. The list of devices that configure is compatible with are
- found in \e{qtbase/mkspecs/devices}. For more information, visit the \l{http://wiki.qt.io/?title=Category:Devices}{Devices}
+ found in \e{qtbase/mkspecs/devices}. For more information, visit the \l{http://wiki.qt.io/Category:Devices}{Devices}
Wiki page.
\li \c -device-option - sets additional qmake variables. For example, \c{-device-option CROSS_COMPILE=}\e{<path-to-toolchain>} provides
the environment variable, \c{CROSS_COMPILE}, as needed by certain devices.
@@ -240,9 +240,9 @@
\li \l{Qt for BlackBerry} - a community-driven site for BlackBerry and
QNX devices
\li \l{Qt for Embedded Linux#Configuring for a Specific Device}{Qt for Embedded Linux - Building from Source}
- \li \l{http://wiki.qt.io/?title=Qt-RaspberryPi}{Qt for Raspberry Pi} - a community-driven site for
+ \li \l{http://wiki.qt.io/Qt_RaspberryPi}{Qt for Raspberry Pi} - a community-driven site for
Raspberry devices
- \li \l{http://wiki.qt.io/?title=Category:Devices}{Devices} - a list of other devices and chipsets
+ \li \l{http://wiki.qt.io/Category:Devices}{Devices} - a list of other devices and chipsets
\endlist
\section1 OpenGL Options for Windows
diff --git a/doc/src/examples.qdoc b/doc/src/examples.qdoc
index 8cc9819c..03395dce 100644
--- a/doc/src/examples.qdoc
+++ b/doc/src/examples.qdoc
@@ -188,5 +188,5 @@
\section1 Community Examples
To view and run examples provided through the Qt Project, visit the
- \l{http://wiki.qt.io/?title=Category:Learning::Demos_and_Examples}{Community Examples} page.
+ \l{http://wiki.qt.io/Category:Learning::Demos_and_Examples}{Community Examples} page.
*/
diff --git a/doc/src/external-resources.qdoc b/doc/src/external-resources.qdoc
index 01b955b2..d0ddf689 100644
--- a/doc/src/external-resources.qdoc
+++ b/doc/src/external-resources.qdoc
@@ -26,7 +26,7 @@
****************************************************************************/
/*!
- \externalpage http://wiki.qt.io/?title=Building_Qt_5_from_Git
+ \externalpage http://wiki.qt.io/Building_Qt_5_from_Git
\title Building Qt 5 From Git
*/
@@ -76,7 +76,7 @@
*/
/*!
- \externalpage http://wiki.qt.io/?title=Category:Add-ons
+ \externalpage http://wiki.qt.io/Category:Add-ons
\title Qt Add-ons
*/
@@ -182,15 +182,15 @@
\title Creating a Mobile Application
*/
/*!
- \externalpage http://wiki.qt.io/?title=Qt5ForAndroidBuilding
+ \externalpage http://wiki.qt.io/Qt5ForAndroidBuilding
\title Building Qt 5 for Android
*/
/*!
- \externalpage http://wiki.qt.io/?title=Qt5_Status_on_BlackBerry10
+ \externalpage http://wiki.qt.io/Qt5_Status_on_BlackBerry10
\title BlackBerry supported modules
*/
/*!
- \externalpage http://wiki.qt.io/?title=Qt-Creator-with-BlackBerry-10
+ \externalpage http://wiki.qt.io/Qt_Creator_with_BlackBerry_10
\title Using Qt Creator for BlackBerry 10 Development
*/
/*!
diff --git a/doc/src/platforms/blackberry.qdoc b/doc/src/platforms/blackberry.qdoc
index 5e6efcfd..16a766b0 100644
--- a/doc/src/platforms/blackberry.qdoc
+++ b/doc/src/platforms/blackberry.qdoc
@@ -119,7 +119,7 @@
\section2 In Qt Creator
See the
- \l{http://wiki.qt.io/?title=Qt-Creator-with-BlackBerry-10}{article}
+ \l{http://wiki.qt.io/Qt_Creator_with_BlackBerry_10}{article}
Qt Creator with BlackBerry 10. Qt Creator 2.7 and later contain a plug-in which integrates
the BlackBerry 10 NDK and its tools into the development process as it is know to Qt
Creator users.
@@ -236,7 +236,7 @@
This matches all essential modules, plus several add-on modules. QtWebKit is currently not
a part of the regular builds. Still, it is possible to build it, see
- \l{http://wiki.qt.io/?title=Building-QtWebKit-for-Blackberry}
+ \l{http://wiki.qt.io/Building_QtWebKit_for_Blackberry}
{Building QtWebKit for Blackberry}
Other repositories known to build:
@@ -507,7 +507,7 @@
In some cases, it might be needed to inspect the actual content of the folders directly on
the device. You can do this in an SSH shell in the File Inspector in the Momentics IDE.
The article
- \l{http://wiki.qt.io/?title=BlackBerry_Hints_n_Tips}{BlackBerry Hints and Tips}
+ \l{http://wiki.qt.io/BlackBerry_Hints_n_Tips}{BlackBerry Hints and Tips}
shows how to use SSH with BlackBerry 10 along with
a few other hints and tips.
diff --git a/doc/src/platforms/ios.qdoc b/doc/src/platforms/ios.qdoc
index bbb24269..98f85054 100644
--- a/doc/src/platforms/ios.qdoc
+++ b/doc/src/platforms/ios.qdoc
@@ -126,7 +126,7 @@
We currently have one example mixing Objective-C and C++ code. You
find it
- \l{http://wiki.qt.io/?title=Mixing_C_and_ObjectiveC_Code}{here}.
+ \l{http://wiki.qt.io/Mixing_C_and_ObjectiveC_Code}{here}.
\section1 Related Topics
@@ -239,7 +239,7 @@
QTPLUGIN += qavfcamera
\endcode
- See \l {http://wiki.qt.io/?title=QtMultimedia_iOS}{Qt Multimedia on iOS}
+ See \l {http://wiki.qt.io/QtMultimedia_iOS}{Qt Multimedia on iOS}
for information on other Qt Multimedia plugins. If your project uses APIs
from \l {Qt Sensors}, use the following:
diff --git a/doc/src/platforms/platform-notes-rtos.qdoc b/doc/src/platforms/platform-notes-rtos.qdoc
index 973c4961..264b52ff 100644
--- a/doc/src/platforms/platform-notes-rtos.qdoc
+++ b/doc/src/platforms/platform-notes-rtos.qdoc
@@ -44,7 +44,7 @@
\contentspage Platform and Compiler Notes
\target QNX
- \note QNX Neutrino RTOS is a community supported platform. See the \l{http://wiki.qt.io/?title=Qnx}{related page} on the Qt Project wiki.
+ \note QNX Neutrino RTOS is a community supported platform. See the \l{http://wiki.qt.io/Qnx}{related page} on the Qt Project wiki.
\section1 Supported Architectures and QNX Releases
@@ -73,7 +73,7 @@
\section1 Supported Modules
Almost all Qt Essential \l{All Modules}{modules} and quite some add-ons are supported on
- the QNX Neutrino RTOS. See the \l{http://wiki.qt.io/?title=Qt_Status_on_QNX}
+ the QNX Neutrino RTOS. See the \l{http://wiki.qt.io/Qt_Status_on_QNX}
{status page on the Qt Project wiki} for details.
If you build Qt from a released source code distribution archive, the \c{configure} tool ensures
diff --git a/doc/src/source-breaks.qdoc b/doc/src/source-breaks.qdoc
index 17870bfe..fdcadbc4 100644
--- a/doc/src/source-breaks.qdoc
+++ b/doc/src/source-breaks.qdoc
@@ -530,7 +530,7 @@ recommendations for handling those changes.
to add the item to the scene.
\li \c{QProxyModel} is removed. Use \l{QAbstractProxyModel} and the related
classes instead. A copy of \c{QProxyModel} is available in the
- \l{http://wiki.qt.io/?title=Qt-5-UI-Helpers}{Ui Helpers} repository.
+ \l{http://wiki.qt.io/Qt_5_UI_Helpers}{Ui Helpers} repository.
\endlist
\section2 Changes to QApplication