diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-10-28 11:38:50 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-10-28 11:38:50 (GMT) |
| commit | 1353e2dcbeaddced00ce55b497844460247118d7 (patch) | |
| tree | ad593bed0d0f4a6eeaf52707d14aafceed7c02af | |
| parent | f6f118b9e45b61c8dab8af976c9a4c4493e73b5f (diff) | |
| parent | 1bf8f94aeb8d40ca6ce8e55fc7add2d64ceadd50 (diff) | |
| download | Qt-1353e2dcbeaddced00ce55b497844460247118d7.zip Qt-1353e2dcbeaddced00ce55b497844460247118d7.tar.gz Qt-1353e2dcbeaddced00ce55b497844460247118d7.tar.bz2 | |
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-team
* 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-team:
Removed unix specific mmap use from QString benchmark
| -rw-r--r-- | tests/benchmarks/corelib/tools/qstring/main.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/benchmarks/corelib/tools/qstring/main.cpp b/tests/benchmarks/corelib/tools/qstring/main.cpp index 5b5f0f7..daefe12 100644 --- a/tests/benchmarks/corelib/tools/qstring/main.cpp +++ b/tests/benchmarks/corelib/tools/qstring/main.cpp @@ -784,7 +784,7 @@ void tst_QString::equals2_data() const static void __attribute__((noinline)) equals2_selftest() { -#ifdef Q_OS_UNIX +#if defined(Q_OS_UNIX) && !defined(Q_OS_SYMBIAN) const long pagesize = sysconf(_SC_PAGESIZE); void *page1, *page3; ushort *page2; @@ -1341,7 +1341,7 @@ void tst_QString::ucstrncmp() const }; static const int functionCount = sizeof func / sizeof func[0]; -#ifdef Q_OS_UNIX +#if defined(Q_OS_UNIX) && !defined(Q_OS_SYMBIAN) const long pagesize = sysconf(_SC_PAGESIZE); void *page1, *page3; ushort *page2; |