From 686da4276a3d16f3f609442886f7a743a13b1f37 Mon Sep 17 00:00:00 2001
From: Mark Brand <mabrand@mabrand.nl>
Date: Wed, 17 Feb 2010 16:51:47 +0100
Subject: Revert "remove -lz from OPENSSL_LIBS so as to respect qt-zlib"

This reverts commit 7228fdef61fd126481574e53d6d022d134219cc3.

Merge-request: 405
Reviewed-by: Thiago Macieira <thiago.macieira@nokia.com>
---
 src/network/ssl/ssl.pri | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/src/network/ssl/ssl.pri b/src/network/ssl/ssl.pri
index 899aa30..72ea80f 100644
--- a/src/network/ssl/ssl.pri
+++ b/src/network/ssl/ssl.pri
@@ -35,11 +35,5 @@ symbian {
     RESOURCES += network.qrc
 
     # Add optional SSL libs
-    !contains(QT_CONFIG, system-zlib):contains(OPENSSL_LIBS, -lz) {
-        # Use the zlib in QtCore
-        OPENSSL_LIBS -= -lz
-        OPENSSL_LIBS += -lQtCore4
-    }
     LIBS_PRIVATE += $$OPENSSL_LIBS
-
 }
-- 
cgit v0.12