[tor-commits] [torbrowser/maint-2.2] OSX: Use our zlib for Qt, instead of Qt's.

[erinn at torproject.org]

commit a3a838b7c52fe9749634b9dbb32731608ed11761
Author: Sebastian Hahn <sebastian at torproject.org>
Date:   Fri Feb 3 16:07:35 2012 +0100

    OSX: Use our zlib for Qt, instead of Qt's.
---
 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 81e10f0..dfa9a4b 100644
--- a/build-scripts/osx.mk
+++ b/build-scripts/osx.mk
@@ -72,7 +72,7 @@ endif
 	cd $(OPENSSL_DIR) && make install
 
 QT_DIR=$(FETCH_DIR)/qt-everywhere-opensource-src-$(QT_VER)
-QT_BUILD_PREFS=-qt-zlib -universal -confirm-license -opensource -openssl-linked -no-qt3support \
+QT_BUILD_PREFS=-system-zlib -universal -confirm-license -opensource -openssl-linked -no-qt3support \
 	-fast -release -no-framework -nomake demos -nomake examples -sdk /Developer/SDKs/MacOSX10.5.sdk/
 QT_OPTS=$(QT_BUILD_PREFS) -prefix $(BUILT_DIR) -I $(BUILT_DIR)/include -I $(BUILT_DIR)/include/openssl/ -L $(BUILT_DIR)/lib
 build-qt: