diff options
| author | Janne Anttila <janne.anttila@digia.com> | 2010-05-19 10:46:47 (GMT) |
|---|---|---|
| committer | Janne Anttila <janne.anttila@digia.com> | 2010-05-21 11:24:18 (GMT) |
| commit | 7afeed5e37c172a2a60b2d4610207243d238b0cb (patch) | |
| tree | 72b1eff1643f2437f6d8ae55df92e504fd494892 | |
| parent | 5f21450a61ba2459e6dc5b08b236b15a067bf81f (diff) | |
| download | Qt-7afeed5e37c172a2a60b2d4610207243d238b0cb.zip Qt-7afeed5e37c172a2a60b2d4610207243d238b0cb.tar.gz Qt-7afeed5e37c172a2a60b2d4610207243d238b0cb.tar.bz2 | |
Fixed qsslkey test deployment for Symbian and fixed compiler warnings.
Reviewed-by: Aleksandar Sasha Babic
| -rw-r--r-- | tests/auto/qsslkey/qsslkey.pro | 6 | ||||
| -rw-r--r-- | tests/auto/qsslkey/tst_qsslkey.cpp | 8 |
2 files changed, 9 insertions, 5 deletions
diff --git a/tests/auto/qsslkey/qsslkey.pro b/tests/auto/qsslkey/qsslkey.pro index 32138f8..a78e184 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 3c8ae11..0e39919 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\<UID>) 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() { |