summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOswald Buddenhagen <oswald.buddenhagen@digia.com>2012-09-18 21:02:02 +0200
committerThe Qt Project <gerrit-noreply@qt-project.org>2012-09-21 16:45:02 +0200
commit0e1c9d37240480777ddc46344c58de468fe791c9 (patch)
treee74c9ec8dcde2f558463673439c7251ae8a4a5c1
parentaa7ff01d60496fa570f1b7549edeece1d364b0ec (diff)
remove traces of webkit build being claimed to be special
Change-Id: I72a36c7aedf7f364a3bd53755af17b803c532cf2 Reviewed-by: Simon Hausmann <simon.hausmann@digia.com> Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com> Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
-rw-r--r--.gitignore1
-rw-r--r--README25
2 files changed, 0 insertions, 26 deletions
diff --git a/.gitignore b/.gitignore
index 9dfd6094..7bd3d3d6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,2 @@
Makefile
-Makefile.qtwebkit
.qmake.cache
diff --git a/README b/README
index 856b2290..e394e040 100644
--- a/README
+++ b/README
@@ -21,7 +21,6 @@ HOW TO BUILD QT5
- OpenSSL for SSL sockets or HTTPS
- Wayland
- - See QtWebKit section.
New dependencies in Qt 5
------------------------
@@ -70,30 +69,6 @@ HOW TO BUILD QT5
More details follow.
- Building QtWebKit
- =================
-
- Linux, Mac:
- -----------
-
- The tools bison, flex and gperf which are required for building.
-
- cd qtwebkit
- export WEBKITOUTPUTDIR=$$PWD/WebKitBuild
- perl Tools/Scripts/build-webkit --qt --qmake=../qtbase/bin/qmake --install-libs=<install dir> --release --makeargs=$MAKEFLAGS
-
- Windows:
- --------
-
- The tools bison, flex and gperf which are required for building are
- provided for convenience in the folder gnuwin32\bin.
-
- set PATH=%PATH%;%CD%\gnuwin32\bin
- cd qtwebkit
- set WEBKITOUTPUTDIR=%CD%/WebKitBuild
- perl Tools\Scripts\build-webkit --qt --qmake=..\qtbase\bin\qmake.exe --install-libs=<install dir> --release --makeargs=%MAKEFLAGS%
-
-
Build!
======