diff options
| author | Thiago Macieira <thiago.macieira@nokia.com> | 2010-05-25 08:23:01 (GMT) |
|---|---|---|
| committer | Thiago Macieira <thiago.macieira@nokia.com> | 2010-05-25 08:23:01 (GMT) |
| commit | 7c471bde498c07f03acc612d5f132b904bc3870e (patch) | |
| tree | 136805e93f9b781c6900f5efaa0bd6ce2301b68d /tests/auto/qsslkey | |
| parent | 55664a0ef4b88b67c9931c7d2f6853e5fa0a9716 (diff) | |
| parent | 6f6909ac6681ed614f00998a0d43b7b195dbb90b (diff) | |
| download | Qt-7c471bde498c07f03acc612d5f132b904bc3870e.zip Qt-7c471bde498c07f03acc612d5f132b904bc3870e.tar.gz Qt-7c471bde498c07f03acc612d5f132b904bc3870e.tar.bz2 | |
Merge remote branch 'origin/4.6' into qt-4.7-from-4.6
Conflicts:
demos/spectrum/app/app.pro
src/gui/egl/qegl.cpp
tests/auto/qhttpnetworkconnection/qhttpnetworkconnection.pro
tests/auto/qmenu/tst_qmenu.cpp
Diffstat (limited to 'tests/auto/qsslkey')
| -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 e3eeef9..dff0db1 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() { |