summaryrefslogtreecommitdiffstats
path: root/tests/auto/network/ssl/qsslkey
diff options
context:
space:
mode:
Diffstat (limited to 'tests/auto/network/ssl/qsslkey')
-rw-r--r--tests/auto/network/ssl/qsslkey/qsslkey.pro23
-rw-r--r--tests/auto/network/ssl/qsslkey/tst_qsslkey.cpp6
2 files changed, 10 insertions, 19 deletions
diff --git a/tests/auto/network/ssl/qsslkey/qsslkey.pro b/tests/auto/network/ssl/qsslkey/qsslkey.pro
index 5a90b76219..f21544ac51 100644
--- a/tests/auto/network/ssl/qsslkey/qsslkey.pro
+++ b/tests/auto/network/ssl/qsslkey/qsslkey.pro
@@ -14,19 +14,16 @@ win32 {
}
}
-wince*|symbian: {
- keyFiles.files = keys
- keyFiles.path = .
+wince* {
+ keyFiles.files = keys
+ keyFiles.path = .
- passphraseFiles.files = rsa-without-passphrase.pem rsa-with-passphrase.pem
- passphraseFiles.path = .
+ passphraseFiles.files = rsa-without-passphrase.pem rsa-with-passphrase.pem
+ passphraseFiles.path = .
- DEPLOYMENT += keyFiles passphraseFiles
-}
-
-wince*: {
- DEFINES += SRCDIR=\\\".\\\"
-} else:!symbian {
- DEFINES+= SRCDIR=\\\"$$PWD\\\"
- TARGET.CAPABILITY = NetworkServices
+ DEPLOYMENT += keyFiles passphraseFiles
+ DEFINES += SRCDIR=\\\".\\\"
+} else {
+ DEFINES+= SRCDIR=\\\"$$PWD\\\"
+ TARGET.CAPABILITY = NetworkServices
}
diff --git a/tests/auto/network/ssl/qsslkey/tst_qsslkey.cpp b/tests/auto/network/ssl/qsslkey/tst_qsslkey.cpp
index ac966ce74a..69bd66ffbf 100644
--- a/tests/auto/network/ssl/qsslkey/tst_qsslkey.cpp
+++ b/tests/auto/network/ssl/qsslkey/tst_qsslkey.cpp
@@ -47,12 +47,6 @@
#include <QtNetwork/qhostaddress.h>
#include <QtNetwork/qnetworkproxy.h>
-#ifdef Q_OS_SYMBIAN
-// In Symbian OS test data is located in applications private dir
-// Current path (C:\private\<UID>) contains only ascii chars
-#define SRCDIR "."
-#endif
-
class tst_QSslKey : public QObject
{
Q_OBJECT