Merge remote-tracking branch 'origin/5.4' into 5.5

Change-Id: I5b894e7f72ad81e62a6ea0777e6713dfa36c8a68
This commit is contained in:
Oswald Buddenhagen
2015-08-14 13:38:53 +02:00
2 changed files with 3 additions and 3 deletions

View File

@@ -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,

View File

@@ -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