commit 6044774ed216c68d9c3fb38f7583a72668375e33 Author: Sebastian Hahn sebastian@torproject.org Date: Sat Apr 21 17:38:49 2012 +0200

Don't build webkit when building Qt, we don't need it --- build-scripts/osx.mk | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/build-scripts/osx.mk b/build-scripts/osx.mk index 6a4bac5..a9c1b81 100644 --- a/build-scripts/osx.mk +++ b/build-scripts/osx.mk @@ -67,7 +67,7 @@ endif

QT_BUILD_PREFS=-system-zlib -confirm-license -opensource -openssl-linked -no-qt3support \ - -fast -release -no-framework -nomake demos -nomake examples $(SDK) -arch $(ARCH_TYPE) + -fast -release -no-webkit -no-framework -nomake demos -nomake examples $(SDK) -arch $(ARCH_TYPE) 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)