lili/qt5
1
0
Fork 0
mirror of git://code.qt.io/qt/qt5.git synced 2026-02-01 19:36:04 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '5.4' into 5.4.2

Browse Source 
Change-Id: I33d967b5f668c672a55ad93ac314340453850521
This commit is contained in:
Oswald Buddenhagen
2015-05-29 20:12:13 +02:00
parent 210493d641 843a3407f2
commit 554fb9039c
3 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.commit-template
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,

8
README
View File

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

4
README.git
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