diff options
| author | Kurt Korbatits <kurt.korbatits@nokia.com> | 2010-06-10 04:37:54 (GMT) |
|---|---|---|
| committer | Kurt Korbatits <kurt.korbatits@nokia.com> | 2010-06-10 04:37:54 (GMT) |
| commit | b2cfa7ceaba6f6aef3f9d01f82f8aba95ba45cd6 (patch) | |
| tree | c84ba40e7e2b5505d4c46a1f144529b0d05f9769 /tests/auto/qsslkey/tst_qsslkey.cpp | |
| parent | a4df1784086ee086e64b35fc1d2df827704708be (diff) | |
| parent | be68f6960f7665c715ea4cca90c2ea4ccae1e0fa (diff) | |
| download | Qt-b2cfa7ceaba6f6aef3f9d01f82f8aba95ba45cd6.zip Qt-b2cfa7ceaba6f6aef3f9d01f82f8aba95ba45cd6.tar.gz Qt-b2cfa7ceaba6f6aef3f9d01f82f8aba95ba45cd6.tar.bz2 | |
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4.6
Diffstat (limited to 'tests/auto/qsslkey/tst_qsslkey.cpp')
| -rw-r--r-- | tests/auto/qsslkey/tst_qsslkey.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
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() { |