diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-04-13 13:03:43 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-04-13 13:03:43 (GMT) |
| commit | 70141f27e6151f7d7e635ef4ac99fb1f38a1f881 (patch) | |
| tree | eaf8ffc78d30b0960051687fc031c98f70d9f6f7 /src | |
| parent | e5515b38a061ef78a1efd17772607c670a98dfab (diff) | |
| parent | 914bc1cb6d29b9fda93be10e73bbcb15465cca8f (diff) | |
| download | Qt-70141f27e6151f7d7e635ef4ac99fb1f38a1f881.zip Qt-70141f27e6151f7d7e635ef4ac99fb1f38a1f881.tar.gz Qt-70141f27e6151f7d7e635ef4ac99fb1f38a1f881.tar.bz2 | |
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
Fix typos, there is no QT_NO_SSL
Diffstat (limited to 'src')
| -rw-r--r-- | src/network/ssl/qsslsocket_openssl_symbols.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/network/ssl/qsslsocket_openssl_symbols.cpp b/src/network/ssl/qsslsocket_openssl_symbols.cpp index 94cc9d2..8620e00 100644 --- a/src/network/ssl/qsslsocket_openssl_symbols.cpp +++ b/src/network/ssl/qsslsocket_openssl_symbols.cpp @@ -742,7 +742,7 @@ bool q_resolveOpenSslSymbols() bool q_resolveOpenSslSymbols() { -#ifdef QT_NO_SSL +#ifdef QT_NO_OPENSSL return false; #endif return true; |