summaryrefslogtreecommitdiffstats
path: root/src/corelib
diff options
context:
space:
mode:
authorShane Kearns <shane.kearns@accenture.com>2010-06-02 12:53:14 (GMT)
committerShane Kearns <shane.kearns@accenture.com>2010-06-02 12:53:14 (GMT)
commit857b2618f3e7574bdff605554b72e6f286ce666a (patch)
tree59ec992e5c2dd268c5f123510198b3840010febb /src/corelib
parent8f517a60c93ec64478772b4cb2ce7d2cd2967647 (diff)
downloadQt-857b2618f3e7574bdff605554b72e6f286ce666a.zip
Qt-857b2618f3e7574bdff605554b72e6f286ce666a.tar.gz
Qt-857b2618f3e7574bdff605554b72e6f286ce666a.tar.bz2
Avoid mmap() on symbian os
QResource and QTranslator use mmap() on unix as an optimisation. Symbian OS doesn't support memory mapped files, so mmap() is actually worse than opening and reading the file yourself. So, switched off mmap() usage on symbian. Reviewed-by: mread
Diffstat (limited to 'src/corelib')
-rw-r--r--src/corelib/io/qresource.cpp2
-rw-r--r--src/corelib/kernel/qtranslator.cpp2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/corelib/io/qresource.cpp b/src/corelib/io/qresource.cpp
index 8e76e9e..ce9c57e 100644
--- a/src/corelib/io/qresource.cpp
+++ b/src/corelib/io/qresource.cpp
@@ -928,7 +928,7 @@ public:
}
};
-#if defined(Q_OS_UNIX)
+#if defined(Q_OS_UNIX) && !defined(Q_OS_SYMBIAN)
#define QT_USE_MMAP
#endif
diff --git a/src/corelib/kernel/qtranslator.cpp b/src/corelib/kernel/qtranslator.cpp
index ca54c6c..1321b14 100644
--- a/src/corelib/kernel/qtranslator.cpp
+++ b/src/corelib/kernel/qtranslator.cpp
@@ -56,7 +56,7 @@
#include "qhash.h"
#include "qtranslator_p.h"
-#if defined(Q_OS_UNIX)
+#if defined(Q_OS_UNIX) && !defined(Q_OS_SYMBIAN)
#define QT_USE_MMAP
#include "private/qcore_unix_p.h"
#endif