4 files changed, 39 insertions, 2 deletions
diff --git a/src/network/ssl/qsslerror.cpp b/src/network/ssl/qsslerror.cpp
index daa6533..3096fee 100644
--- a/src/network/ssl/qsslerror.cpp
+++ b/src/network/ssl/qsslerror.cpp
@@ -110,6 +110,23 @@ public:
 
     \sa QSslCertificate
 */
+
+// RVCT compiler in debug build does not like about default values in const-
+// So as an workaround we define all constructor overloads here explicitly
+QSslError::QSslError()
+    : d(new QSslErrorPrivate)
+{
+    d->error = QSslError::NoError;
+    d->certificate = QSslCertificate();
+}
+
+QSslError::QSslError(SslError error)
+    : d(new QSslErrorPrivate)
+{
+    d->error = error;
+    d->certificate = QSslCertificate();
+}
+
 QSslError::QSslError(SslError error, const QSslCertificate &certificate)
     : d(new QSslErrorPrivate)
 {
diff --git a/src/network/ssl/qsslerror.h b/src/network/ssl/qsslerror.h
index c120215..50cc142 100644
--- a/src/network/ssl/qsslerror.h
+++ b/src/network/ssl/qsslerror.h
@@ -86,8 +86,14 @@ public:
         UnspecifiedError = -1
     };
 
-    QSslError(SslError error = NoError, const QSslCertificate &certificate = QSslCertificate());
+    // RVCT compiler in debug build does not like about default values in const-
+    // So as an workaround we define all constructor overloads here explicitly
+    QSslError();
+    QSslError(SslError error);
+    QSslError(SslError error, const QSslCertificate &certificate);
+
     QSslError(const QSslError &other);
+
     ~QSslError();
     QSslError &operator=(const QSslError &other);
     bool operator==(const QSslError &other) const;
diff --git a/src/network/ssl/qsslsocket_openssl_p.h b/src/network/ssl/qsslsocket_openssl_p.h
index b3be42a..968fdc0 100644
--- a/src/network/ssl/qsslsocket_openssl_p.h
+++ b/src/network/ssl/qsslsocket_openssl_p.h
@@ -77,6 +77,10 @@
 #include <openssl/x509.h>
 #include <openssl/x509v3.h>
 #include <openssl/x509_vfy.h>
+#ifdef Q_OS_SYMBIAN
+#include <openssl/dsa.h>
+#include <openssl/rsa.h>
+#endif
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/network/ssl/ssl.pri b/src/network/ssl/ssl.pri
index 196e19d..5427370 100644
--- a/src/network/ssl/ssl.pri
+++ b/src/network/ssl/ssl.pri
@@ -1,6 +1,16 @@
 # OpenSSL support; compile in QSslSocket.
 contains(QT_CONFIG, openssl) | contains(QT_CONFIG, openssl-linked) {
-    include($$QT_SOURCE_TREE/config.tests/unix/openssl/openssl.pri)
+    
+
+symbian {
+	TRY_INCLUDEPATHS = $${EPOCROOT}epoc32/include $${EPOCROOT}epoc32/include/stdapis $${EPOCROOT}epoc32/include/stdapis/sys $$OS_LAYER_LIBC_SYSTEMINCLUDE
+	for(p, TRY_INCLUDEPATHS) {
+		pp = $$join(p, "", "", "/openssl")
+		exists($$pp):INCLUDEPATH *= $$pp
+	}
+} else {
+	include($$QT_SOURCE_TREE/config.tests/unix/openssl/openssl.pri) 
+}
 
     HEADERS += ssl/qssl.h \
                ssl/qsslcertificate.h \