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

OPENSSL_LIBS can introduce -lz. To respect qt-zlib, this must be
replaced with -lQtCore4. Otherwise, linking can fail due to there
being two different libraries providing zlib.

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

diff --git a/src/network/ssl/ssl.pri b/src/network/ssl/ssl.pri
index 72ea80f..899aa30 100644
--- a/src/network/ssl/ssl.pri
+++ b/src/network/ssl/ssl.pri
@@ -35,5 +35,11 @@ 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