diff options
author | Jason McDonald <jason.mcdonald@nokia.com> | 2011-09-27 19:53:01 +1000 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2011-09-29 06:41:42 +0200 |
commit | 95cebd34ebc5b4d39b11dc91610309a35e488663 (patch) | |
tree | 90ceffef5acea093dd2b8f8f7e8c30593023b85a /tests/auto/network/ssl/qsslcertificate | |
parent | ab061e3e436fab35eac8666f3e950e98f66c4d3e (diff) |
Remove Symbian-specific code from tests.
Symbian is not a supported platform for Qt5, so this code is no longer
required.
Change-Id: I1172e6a42d518490e63e9599bf10579df08259aa
Reviewed-on: http://codereview.qt-project.org/5657
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
Diffstat (limited to 'tests/auto/network/ssl/qsslcertificate')
-rw-r--r-- | tests/auto/network/ssl/qsslcertificate/qsslcertificate.pro | 19 | ||||
-rw-r--r-- | tests/auto/network/ssl/qsslcertificate/tst_qsslcertificate.cpp | 6 |
2 files changed, 7 insertions, 18 deletions
diff --git a/tests/auto/network/ssl/qsslcertificate/qsslcertificate.pro b/tests/auto/network/ssl/qsslcertificate/qsslcertificate.pro index 05cce8e509..36b7b7bc57 100644 --- a/tests/auto/network/ssl/qsslcertificate/qsslcertificate.pro +++ b/tests/auto/network/ssl/qsslcertificate/qsslcertificate.pro @@ -14,16 +14,11 @@ win32 { } } -wince*|symbian: { - certFiles.files = certificates more-certificates - certFiles.path = . - DEPLOYMENT += certFiles -} - -wince*: { - DEFINES += SRCDIR=\\\".\\\" -} else:!symbian { - DEFINES += SRCDIR=\\\"$$PWD/\\\" +wince* { + certFiles.files = certificates more-certificates + certFiles.path = . + DEPLOYMENT += certFiles + DEFINES += SRCDIR=\\\".\\\" +} else { + DEFINES += SRCDIR=\\\"$$PWD/\\\" } - -symbian:TARGET.CAPABILITY = NetworkServices ReadUserData diff --git a/tests/auto/network/ssl/qsslcertificate/tst_qsslcertificate.cpp b/tests/auto/network/ssl/qsslcertificate/tst_qsslcertificate.cpp index bcd21eefe2..0f033fc726 100644 --- a/tests/auto/network/ssl/qsslcertificate/tst_qsslcertificate.cpp +++ b/tests/auto/network/ssl/qsslcertificate/tst_qsslcertificate.cpp @@ -45,12 +45,6 @@ #include <qsslkey.h> #include <qsslsocket.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_QSslCertificate : public QObject { Q_OBJECT |