diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-06-03 06:02:53 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-06-03 06:02:53 (GMT) |
| commit | a7189fb75a168f89db07d07eeb4f7fcd35d69942 (patch) | |
| tree | 05663b65c9ab8784c531c4a06f57817e4de69c8e /src/corelib | |
| parent | bb30e507c69ef9b91af73638ffb5771ce4f808e0 (diff) | |
| parent | 857b2618f3e7574bdff605554b72e6f286ce666a (diff) | |
| download | Qt-a7189fb75a168f89db07d07eeb4f7fcd35d69942.zip Qt-a7189fb75a168f89db07d07eeb4f7fcd35d69942.tar.gz Qt-a7189fb75a168f89db07d07eeb4f7fcd35d69942.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public:
Avoid mmap() on symbian os
Fix Qt.sis content for Symbian^3 builds
Diffstat (limited to 'src/corelib')
| -rw-r--r-- | src/corelib/io/qresource.cpp | 2 | ||||
| -rw-r--r-- | src/corelib/kernel/qtranslator.cpp | 2 |
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 |