diff options
author | Thiago Macieira <thiago.macieira@nokia.com> | 2010-08-11 16:34:48 (GMT) |
---|---|---|
committer | Thiago Macieira <thiago.macieira@nokia.com> | 2010-08-11 16:34:48 (GMT) |
commit | 319f4f07c80664d6e244daf22d9b4c13e5d4e69a (patch) | |
tree | 60c2b9b1462eab6eab6a15f541fe361c7a878eab /src/testlib | |
parent | ccb838e6d4e661c9280d5c69fa0b1717b85a1dd9 (diff) | |
parent | 8dca92fd7987a9aa727dea6c367c079a39668f09 (diff) | |
download | Qt-319f4f07c80664d6e244daf22d9b4c13e5d4e69a.zip Qt-319f4f07c80664d6e244daf22d9b4c13e5d4e69a.tar.gz Qt-319f4f07c80664d6e244daf22d9b4c13e5d4e69a.tar.bz2 |
Merge remote branch 'origin/4.6' into qt-4.7-from-4.6
Conflicts:
src/gui/kernel/qt_s60_p.h
src/opengl/qglextensions.cpp
src/opengl/qglshaderprogram.cpp
tests/auto/mediaobject/tst_mediaobject.cpp
Diffstat (limited to 'src/testlib')
-rw-r--r-- | src/testlib/qtestfilelogger.cpp | 16 |
1 files changed, 13 insertions, 3 deletions
diff --git a/src/testlib/qtestfilelogger.cpp b/src/testlib/qtestfilelogger.cpp index a5cdc80..9d1ee6a 100644 --- a/src/testlib/qtestfilelogger.cpp +++ b/src/testlib/qtestfilelogger.cpp @@ -44,6 +44,8 @@ #include "QtTest/private/qtestlog_p.h" #include "QtTest/private/qtestresult_p.h" +#include <QtCore/qdir.h> + #include <stdlib.h> #include <stdio.h> @@ -69,11 +71,19 @@ QTestFileLogger::~QTestFileLogger() void QTestFileLogger::init() { char filename[100]; + int index = 0; +#if defined(Q_OS_SYMBIAN) + QByteArray ba(QDir::toNativeSeparators(QString(QDir::homePath()+QDir::separator())).toUtf8()); + index = ba.length(); + QTest::qt_snprintf(filename, sizeof(filename), "%s%s.log", + ba.constData(), QTestResult::currentTestObjectName()); +#else QTest::qt_snprintf(filename, sizeof(filename), "%s.log", QTestResult::currentTestObjectName()); - - // Keep filenames simple - for (uint i = 0; i < sizeof(filename) && filename[i]; ++i) { +#endif + + // Keep filenames simple + for (uint i = index; i < sizeof(filename) && filename[i]; ++i) { char& c = filename[i]; if (!((c >= 'a' && c <= 'z') || (c >= 'A' && c <= 'Z') || (c >= '0' && c <= '9') || c == '-' || c == '.')) { |