summaryrefslogtreecommitdiffstats
path: root/src/network/ssl
diff options
context:
space:
mode:
authorJanne Anttila <janne.anttila@digia.com>2009-08-03 12:39:54 (GMT)
committerJanne Anttila <janne.anttila@digia.com>2009-08-03 12:53:19 (GMT)
commit78b769c7d433e38352ac936c4d1f2e35134f5fa0 (patch)
treef7289ef134c6593036931bc0ade775f928392df7 /src/network/ssl
parentae597a532683e5d544400b62497c870cf570b069 (diff)
downloadQt-78b769c7d433e38352ac936c4d1f2e35134f5fa0.zip
Qt-78b769c7d433e38352ac936c4d1f2e35134f5fa0.tar.gz
Qt-78b769c7d433e38352ac936c4d1f2e35134f5fa0.tar.bz2
Trailing whitespace and tab/space fixes for QtNetwork
Diffstat (limited to 'src/network/ssl')
-rw-r--r--src/network/ssl/qsslsocket_openssl_symbols.cpp4
-rw-r--r--src/network/ssl/ssl.pri4
2 files changed, 4 insertions, 4 deletions
diff --git a/src/network/ssl/qsslsocket_openssl_symbols.cpp b/src/network/ssl/qsslsocket_openssl_symbols.cpp
index 6b777e3..2199a58 100644
--- a/src/network/ssl/qsslsocket_openssl_symbols.cpp
+++ b/src/network/ssl/qsslsocket_openssl_symbols.cpp
@@ -602,7 +602,7 @@ bool q_resolveOpenSslSymbols()
RESOLVEFUNC(d2i_RSAPrivateKey, 2296, libs.second )
#endif
RESOLVEFUNC(OPENSSL_add_all_algorithms_noconf, 1153, libs.second )
- RESOLVEFUNC(OPENSSL_add_all_algorithms_conf, 1152, libs.second )
+ RESOLVEFUNC(OPENSSL_add_all_algorithms_conf, 1152, libs.second )
#else // Q_OS_SYMBIAN
#ifdef SSLEAY_MACROS
RESOLVEFUNC(ASN1_dup)
@@ -723,7 +723,7 @@ bool q_resolveOpenSslSymbols()
#endif
RESOLVEFUNC(OPENSSL_add_all_algorithms_noconf)
RESOLVEFUNC(OPENSSL_add_all_algorithms_conf)
-#endif // Q_OS_SYMBIAN
+#endif // Q_OS_SYMBIAN
symbolsResolved = true;
delete libs.first;
delete libs.second;
diff --git a/src/network/ssl/ssl.pri b/src/network/ssl/ssl.pri
index 6021d5d..d07f406 100644
--- a/src/network/ssl/ssl.pri
+++ b/src/network/ssl/ssl.pri
@@ -1,11 +1,11 @@
# OpenSSL support; compile in QSslSocket.
contains(QT_CONFIG, openssl) | contains(QT_CONFIG, openssl-linked) {
-
+
symbian {
INCLUDEPATH *= $$OS_LAYER_SSL_SYSTEMINCLUDE
} else {
- include($$QT_SOURCE_TREE/config.tests/unix/openssl/openssl.pri)
+ include($$QT_SOURCE_TREE/config.tests/unix/openssl/openssl.pri)
}
HEADERS += ssl/qssl.h \