summaryrefslogtreecommitdiff
path: root/README
diff options
context:
space:
mode:
authorMarius Storm-Olsen <marius.storm-olsen@nokia.com>2012-03-28 05:48:40 -0500
committerQt by Nokia <qt-info@nokia.com>2012-03-29 04:05:41 +0200
commit598f4975d3d7c9fcd3e3f1451d328402dc01257e (patch)
tree5a59b1a6b195bff4bf5948600c5d32e21e76372e /README
parent2e119465a50fef1f94f4f0c032bd1ac6885c1761 (diff)
downloadqt5-598f4975d3d7c9fcd3e3f1451d328402dc01257e.tar.gz
Fix readme to instruct building with the build script instead
Also, on Windows the build script adds the gnuwin32\bin directory, so we don't need that part in the readme Change-Id: I36ac9ebef9ce8b74fa75f63be7243bb334512a32 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Diffstat (limited to 'README')
-rw-r--r--README11
1 files changed, 8 insertions, 3 deletions
diff --git a/README b/README
index 9cac8bd3..5ad781ee 100644
--- a/README
+++ b/README
@@ -31,7 +31,7 @@ HOW TO BUILD QT5
cd <path>/qt-everywhere-opensource-src-<version>
export PATH=$PATH:$PWD/qtbase/bin
./configure -prefix $PWD/qtbase -opensource -nomake tests
- make -j4
+ ./build -j4
Windows:
--------
@@ -41,13 +41,18 @@ HOW TO BUILD QT5
path.
cd <path>\qt-everywhere-opensource-src-<version>
- set PATH=%PATH%;%CD%\qtbase\bin;%CD%\gnuwin32\bin
+ set PATH=%PATH%;%CD%\qtbase\bin;
configure -prefix %CD%\qtbase -opensource -nomake tests
- nmake
+ perl build
For MinGW (gcc version 4.6 or later), ensure that the compiler can
be found in the path.
+ The build script will use jom if it's found in the path, which means you can
+ use -j <n> options on Windows as well. If not, the /MP option is added to the
+ compile options of the Microsoft Visual Studio compiler, to use all available
+ cores for batch building.
+
More details follow.
Building QtWebKit