diff options
| author | Thierry Bastian <thierry.bastian@nokia.com> | 2011-03-10 13:43:22 (GMT) |
|---|---|---|
| committer | Thierry Bastian <thierry.bastian@nokia.com> | 2011-03-10 13:43:22 (GMT) |
| commit | 306d16002220b99ad386fb1255034b94861a8c9f (patch) | |
| tree | 1da1a91756e396e134173caeb4772f3f466033a4 /src/corelib/io/qresource.cpp | |
| parent | f82f128451ef78e968c85944af10e0e54dbb73c5 (diff) | |
| parent | 5c36cc0ba648d5efa7592e86d49b23086cdbb8ff (diff) | |
| download | Qt-306d16002220b99ad386fb1255034b94861a8c9f.zip Qt-306d16002220b99ad386fb1255034b94861a8c9f.tar.gz Qt-306d16002220b99ad386fb1255034b94861a8c9f.tar.bz2 | |
Merge branch 'master-upstream'
Diffstat (limited to 'src/corelib/io/qresource.cpp')
| -rw-r--r-- | src/corelib/io/qresource.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/corelib/io/qresource.cpp b/src/corelib/io/qresource.cpp index 2a9d8ee..0435256 100644 --- a/src/corelib/io/qresource.cpp +++ b/src/corelib/io/qresource.cpp @@ -928,7 +928,7 @@ public: } }; -#if defined(Q_OS_UNIX) && !defined(Q_OS_SYMBIAN) && ! defined (Q_OS_NACL) +#if defined(Q_OS_UNIX) && !defined(Q_OS_SYMBIAN) && !defined (Q_OS_NACL) && !defined(Q_OS_INTEGRITY) #define QT_USE_MMAP #endif |