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

Merge branch 'stable' into release

Browse Source 
Conflicts:
	README
	qtwebkit-examples-and-demos

Change-Id: I23089d0f8a555d78e14f88bc55a48a78fe4a0e53
This commit is contained in:
Sergio Ahumada
2013-05-23 15:30:52 +02:00
parent 3f9837797d 292a7a7430
commit f89dd01d19
21 changed files with 193 additions and 146 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
README
View File

@@ -49,17 +49,16 @@ HOW TO BUILD QT5
Windows:
--------
Open a Windows SDK (7.0, 7.1 or later) command prompt. Ensure that Perl
version 5.12 or later and Python version 2.7 or later can be found in the
path.
Open a Windows SDK (7.0, 7.1 or later) command prompt. Ensure that the
following tools can be found in the path:
* Perl version 5.12 or later [http://www.activestate.com/activeperl/]
* Python version 2.7 or later [http://www.activestate.com/activepython/]
* Ruby version 1.9.3 or later [http://rubyinstaller.org/]
cd <path>\qt-everywhere-opensource-src-<version>
configure -prefix %CD%\qtbase -opensource -nomake tests
nmake // jom // mingw32-make
For MinGW (gcc version 4.6 or later), ensure that the compiler can
be found in the path.
To accelerate the bootstrap of qmake with MSVC, it may be useful to pass
"-make-tool jom" on the configure command line. If you do not use jom,
adding "/MP" to the CL environment variable is a good idea.
@@ -122,6 +121,7 @@ HOW TO BUILD QT5
=====================
See http://qt-project.org/wiki/Building-Qt-5-from-Git and README.git
for more information.
See http://qt-project.org/wiki/Qt-5 for the reference platforms.
Documentation