diff options
| author | Mark Brand <mabrand@mabrand.nl> | 2010-02-17 15:51:47 (GMT) |
|---|---|---|
| committer | Thiago Macieira <thiago.macieira@nokia.com> | 2010-02-17 16:15:22 (GMT) |
| commit | 686da4276a3d16f3f609442886f7a743a13b1f37 (patch) | |
| tree | b3ad629b08e28d553b58080bcfd1e2885a6d70e6 /src | |
| parent | 3d5d159ac8ef506e6b1f33822547df0af54bbeb3 (diff) | |
| download | Qt-686da4276a3d16f3f609442886f7a743a13b1f37.zip Qt-686da4276a3d16f3f609442886f7a743a13b1f37.tar.gz Qt-686da4276a3d16f3f609442886f7a743a13b1f37.tar.bz2 | |
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>
Diffstat (limited to 'src')
| -rw-r--r-- | src/network/ssl/ssl.pri | 6 |
1 files changed, 0 insertions, 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 - } |