aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>2015-05-29 20:12:13 +0200
committerOswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>2015-05-29 20:12:13 +0200
commit4a5968ce756e80698d051dcfbe47f19d81873361 (patch)
tree2bde85e0189fa699b240010b9319cd7620acd248
parent210493d6412fe1a3d0fce3be500f9d056e497047 (diff)
parent843a3407f2d9f748ffe56575fc034e93f8603f23 (diff)
Merge branch '5.4' into 5.4.2v5.4.2
-rw-r--r--.commit-template2
-rw-r--r--README8
-rw-r--r--README.git4
3 files changed, 7 insertions, 7 deletions
diff --git a/.commit-template b/.commit-template
index 3edc08db..26441ac5 100644
--- a/.commit-template
+++ b/.commit-template
@@ -14,7 +14,7 @@
#
# ==[ Please wrap at 72 characters ]===================================|
#
-# Remember to read http://wiki.qt-project.org/Commit_Policy
+# Remember to read http://wiki.qt.io/Commit_Policy
#
# Change log entry: If this commit adds a significant feature, fixes an
# issue or contains a behavior change that is relevant to others,
diff --git a/README b/README
index 54f95bcf..8211fa47 100644
--- a/README
+++ b/README
@@ -14,7 +14,7 @@ HOW TO BUILD QT5
For other platform specific requirements,
please see section "Setting up your machine" on:
- http://qt-project.org/wiki/Get_The_Source
+ http://wiki.qt.io/Get_The_Source
Optional requirements
---------------------
@@ -119,9 +119,9 @@ HOW TO BUILD QT5
Building Qt5 from git
=====================
- See http://qt-project.org/wiki/Building-Qt-5-from-Git and README.git
+ See http://wiki.qt.io/Building_Qt_5_from_Git and README.git
for more information.
- See http://qt-project.org/wiki/Qt-5 for the reference platforms.
+ See http://wiki.qt.io/Qt_5 for the reference platforms.
Documentation
@@ -139,6 +139,6 @@ HOW TO BUILD QT5
Running "qmake -query" will list the value of QT_INSTALL_DOCS.
Information about Qt 5's documentation is located in qtbase/doc/README
- or in the following page: http://qt-project.org/wiki/Qt5DocumentationProject
+ or in the following page: http://wiki.qt.io/Qt5DocumentationProject
Note: Building the documentation is only tested on desktop platforms.
diff --git a/README.git b/README.git
index 7934bea9..201612be 100644
--- a/README.git
+++ b/README.git
@@ -5,7 +5,7 @@ OBTAINING QT5 FROM GIT
========
For a more in-depth description on how to build Qt5 from git,
- please see: http://qt-project.org/wiki/Building-Qt-5-from-Git
+ please see: http://wiki.qt.io/Building_Qt_5_from_Git
Get The Submodules
@@ -52,4 +52,4 @@ OBTAINING QT5 FROM GIT
================================
For more information on how to develop and contribute to Qt, please see:
- http://qt-project.org/wiki/Category:Developing_Qt
+ http://wiki.qt.io/Category:Developing_Qt