[tor-commits] [torbrowser/maint-2.3] Lin: Don't build webkit support into Qt

erinn at torproject.org erinn at torproject.org
Fri Apr 27 13:09:23 UTC 2012

commit 1cf692430f07aa7c77c9d9661e900c8dc61a5063
Author: Sebastian Hahn <sebastian at torproject.org>
Date:   Fri Apr 27 12:30:55 2012 +0200

    Lin: Don't build webkit support into Qt
    We don't use it, and we've also gotten rid of it on OS X
 build-scripts/linux.mk |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/build-scripts/linux.mk b/build-scripts/linux.mk
index 313c021..dec0294 100644
--- a/build-scripts/linux.mk
+++ b/build-scripts/linux.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-qt3support -fast -release -nomake demos -nomake examples
+QT_BUILD_PREFS=-system-zlib -confirm-license -opensource -openssl-linked -no-webkit -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)

More information about the tor-commits mailing list