diff options
author | Sergio Ahumada <sergio.ahumada@digia.com> | 2013-05-23 15:30:52 +0200 |
---|---|---|
committer | Sergio Ahumada <sergio.ahumada@digia.com> | 2013-05-23 15:46:50 +0200 |
commit | f89dd01d1987cdbf3de9927227d7345f2a43bdf5 (patch) | |
tree | b784ad221113afe496c388d8afef907700618bc0 /README | |
parent | 3f9837797d4fc5226d4f6063ee6a52b349521155 (diff) | |
parent | 292a7a74309c378c8164dba7de4264fe4ad341de (diff) | |
download | qt5-f89dd01d1987cdbf3de9927227d7345f2a43bdf5.tar.gz |
Merge branch 'stable' into release
Conflicts:
README
qtwebkit-examples-and-demos
Change-Id: I23089d0f8a555d78e14f88bc55a48a78fe4a0e53
Diffstat (limited to 'README')
-rw-r--r-- | README | 12 |
1 files changed, 6 insertions, 6 deletions
@@ -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 |