[tor-commits] [torbrowser/maint-2.3] Linux: we need to build Qt with webkit, otherwise the build fails

[erinn at torproject.org]

commit 5ef69661951c6e59e0fc23c1447fef7c87be8e4b
Author: Erinn Clark <erinn at torproject.org>
Date:   Sat Aug 11 08:51:27 2012 +0100

    Linux: we need to build Qt with webkit, otherwise the build fails
---
 build-scripts/linux-alpha.mk |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/build-scripts/linux-alpha.mk b/build-scripts/linux-alpha.mk
index 8427a10..871ca36 100644
--- a/build-scripts/linux-alpha.mk
+++ b/build-scripts/linux-alpha.mk
@@ -55,7 +55,7 @@ build-openssl: build-zlib $(OPENSSL_DIR)
 	cd $(OPENSSL_DIR) && make install_sw
 	touch $(STAMP_DIR)/build-openssl
 
-QT_BUILD_PREFS=-system-zlib -confirm-license -opensource -openssl-linked -no-webkit -no-qt3support -fast -release -nomake demos -nomake examples
+QT_BUILD_PREFS=-system-zlib -confirm-license -opensource -openssl-linked -no-qt3support -fast -release -nomake demos -nomake examples
 QT_OPTS=$(QT_BUILD_PREFS) -prefix $(BUILT_DIR) -I $(BUILT_DIR)/include -I $(BUILT_DIR)/include/openssl/ -L$(BUILT_DIR)/lib
 build-qt: build-zlib build-openssl $(QT_DIR)
 	cd $(QT_DIR) && ./configure $(QT_OPTS)