Fixed qsslsocket auto test compilation for Symbian.

2 files changed, 20 insertions, 16 deletions

diff --git a/tests/auto/qsslsocket/qsslsocket.pro b/tests/auto/qsslsocket/qsslsocket.pro
index f288866..8f61318 100644
--- a/tests/auto/qsslsocket/qsslsocket.pro
+++ b/tests/auto/qsslsocket/qsslsocket.pro
@@ -7,12 +7,6 @@ QT -= gui
 
 TARGET = tst_qsslsocket
 
-!wince* {
-DEFINES += SRCDIR=\\\"$$PWD/\\\"
-} else {
-DEFINES += SRCDIR=\\\"./\\\"
-}
-
 win32 {
   CONFIG(debug, debug|release) {
     DESTDIR = debug
@@ -21,14 +15,20 @@ win32 {
   }
 }
 
-
-symbian:{
+wince* {
+    DEFINES += SRCDIR=\\\"./\\\"
+    
+    certFiles.sources = certs ssl.tar.gz
+    certFiles.path    = .
+    DEPLOYMENT += certFiles
+} else:symbian {
     DEFINES += QSSLSOCKET_CERTUNTRUSTED_WORKAROUND
     TARGET.EPOCHEAPSIZE="0x100 0x1000000"
     TARGET.CAPABILITY="ALL -TCB"
-}
-wince*|symbian: {
-   certFiles.sources = certs ssl.tar.gz
-   certFiles.path    = .
-   DEPLOYMENT += certFiles
+    
+    certFiles.sources = certs ssl.tar.gz
+    certFiles.path    = .
+    DEPLOYMENT += certFiles
+} else {
+    DEFINES += SRCDIR=\\\"$$PWD/\\\"
 }
diff --git a/tests/auto/qsslsocket/tst_qsslsocket.cpp b/tests/auto/qsslsocket/tst_qsslsocket.cpp
index 59857e5..6147551 100644
--- a/tests/auto/qsslsocket/tst_qsslsocket.cpp
+++ b/tests/auto/qsslsocket/tst_qsslsocket.cpp
@@ -76,6 +76,10 @@ Q_DECLARE_METATYPE(QSslError)
 #define QSSLSOCKET_CERTUNTRUSTED_WORKAROUND
 #endif
 
+#ifdef Q_OS_SYMBIAN
+#define SRCDIR ""
+#endif
+
 #ifndef QT_NO_OPENSSL
 class QSslSocketPtr: public QSharedPointer<QSslSocket>
 {
@@ -528,17 +532,17 @@ void tst_QSslSocket::sslErrors()
     socket->connectToHostEncrypted(host, port);
     socket->waitForEncrypted(5000);
 
-    SslErrorList list;
+    SslErrorList output;
     foreach (QSslError error, socket->sslErrors()) {
         //printf("error = %s\n", error.errorString().toAscii().data());
-        list << error.error();
+        output << error.error();
     }
 
 #ifdef QSSLSOCKET_CERTUNTRUSTED_WORKAROUND
     if (output.last() == QSslError::CertificateUntrusted)
         output.takeLast();
 #endif
-    QCOMPARE(list, errors);
+    QCOMPARE(output, expected);
 }
 
 void tst_QSslSocket::addCaCertificate()