summaryrefslogtreecommitdiffstats
path: root/tests/auto/qfile
diff options
context:
space:
mode:
authorShane Kearns <shane.kearns@accenture.com>2010-10-22 15:00:24 (GMT)
committerShane Kearns <shane.kearns@accenture.com>2010-10-29 13:22:09 (GMT)
commit484770255f421d71954df4511e3541d2d4654d4e (patch)
tree517604946f4d891a5e519e7530525cca8da46bc4 /tests/auto/qfile
parentae9b1a4a392953097d05d55549cc1583f94c3bc8 (diff)
downloadQt-484770255f421d71954df4511e3541d2d4654d4e.zip
Qt-484770255f421d71954df4511e3541d2d4654d4e.tar.gz
Qt-484770255f421d71954df4511e3541d2d4654d4e.tar.bz2
Re-enable emulated QFile::map on symbian
Memory mapping of RFile handles is not supported in current symbian OS versions. However the "open C" libraries provide an emulated mmap() implementation which was used by QFile::map in Qt 4.6 release. To avoid breaking applications which rely on this function, QFile::map will now open the file with open C as well in order to use that handle to call mmap(). When symbian implements a file mapping API, we can switch the implementation to use that for RFile handles. Reviewed-By: joao
Diffstat (limited to 'tests/auto/qfile')
-rw-r--r--tests/auto/qfile/tst_qfile.cpp12
1 files changed, 0 insertions, 12 deletions
diff --git a/tests/auto/qfile/tst_qfile.cpp b/tests/auto/qfile/tst_qfile.cpp
index 4e7cb9f..088c1f2 100644
--- a/tests/auto/qfile/tst_qfile.cpp
+++ b/tests/auto/qfile/tst_qfile.cpp
@@ -2800,10 +2800,6 @@ void tst_QFile::map()
QFETCH(int, size);
QFETCH(QFile::FileError, error);
-#ifdef Q_OS_SYMBIAN
- QSKIP("memory mapped files not supported on this platform", SkipAll);
-#endif
-
QString fileName = QDir::currentPath() + '/' + "qfile_map_testfile";
#ifdef Q_WS_WINCE
@@ -2925,10 +2921,6 @@ void tst_QFile::mapResource()
QFETCH(int, size);
QFETCH(QFile::FileError, error);
-#ifdef Q_OS_SYMBIAN
- QSKIP("memory mapped files not supported on this platform", SkipAll);
-#endif
-
QFile file(fileName);
uchar *memory = file.map(offset, size);
QCOMPARE(file.error(), error);
@@ -2954,10 +2946,6 @@ void tst_QFile::mapOpenMode()
QFETCH(int, openMode);
static const qint64 fileSize = 4096;
-#ifdef Q_OS_SYMBIAN
- QSKIP("memory mapped files not supported on this platform", SkipAll);
-#endif
-
QByteArray pattern(fileSize, 'A');
QString fileName = QDir::currentPath() + '/' + "qfile_map_testfile";