From 7afeed5e37c172a2a60b2d4610207243d238b0cb Mon Sep 17 00:00:00 2001 From: Janne Anttila Date: Wed, 19 May 2010 13:46:47 +0300 Subject: Fixed qsslkey test deployment for Symbian and fixed compiler warnings. Reviewed-by: Aleksandar Sasha Babic --- tests/auto/qsslkey/qsslkey.pro | 6 +++++- tests/auto/qsslkey/tst_qsslkey.cpp | 8 ++++---- 2 files changed, 9 insertions(+), 5 deletions(-) (limited to 'tests') diff --git a/tests/auto/qsslkey/qsslkey.pro b/tests/auto/qsslkey/qsslkey.pro index 32138f84f9..a78e184d1a 100644 --- a/tests/auto/qsslkey/qsslkey.pro +++ b/tests/auto/qsslkey/qsslkey.pro @@ -17,7 +17,11 @@ win32 { wince*|symbian: { keyFiles.sources = keys keyFiles.path = . - DEPLOYMENT += keyFiles + + passphraseFiles.sources = rsa-without-passphrase.pem rsa-with-passphrase.pem + passphraseFiles.path = . + + DEPLOYMENT += keyFiles passphraseFiles } wince*: { diff --git a/tests/auto/qsslkey/tst_qsslkey.cpp b/tests/auto/qsslkey/tst_qsslkey.cpp index 3c8ae11b2c..0e39919d6c 100644 --- a/tests/auto/qsslkey/tst_qsslkey.cpp +++ b/tests/auto/qsslkey/tst_qsslkey.cpp @@ -50,7 +50,7 @@ #ifdef Q_OS_SYMBIAN // In Symbian OS test data is located in applications private dir // Current path (C:\private\) contains only ascii chars -#define SRCDIR QDir::currentPath().toAscii() +#define SRCDIR "." #endif class tst_QSslKey : public QObject @@ -167,9 +167,9 @@ void tst_QSslKey::emptyConstructor() QCOMPARE(key, key2); } -Q_DECLARE_METATYPE(QSsl::KeyAlgorithm); -Q_DECLARE_METATYPE(QSsl::KeyType); -Q_DECLARE_METATYPE(QSsl::EncodingFormat); +Q_DECLARE_METATYPE(QSsl::KeyAlgorithm) +Q_DECLARE_METATYPE(QSsl::KeyType) +Q_DECLARE_METATYPE(QSsl::EncodingFormat) void tst_QSslKey::createPlainTestRows() { -- cgit v1.2.3