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