diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-11-01 12:46:45 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-11-01 12:46:45 (GMT) |
| commit | 067e3fb0868814351829647358dea583d28d010e (patch) | |
| tree | 44da0b2bb77a5e5c3f2c802e437753a6ac9cc911 /tests | |
| parent | 9dbf970d12e6670b247ea92570311a091a22cc69 (diff) | |
| parent | 5d09315ecc731b23636fbf4b19e1b0e9b9876887 (diff) | |
| download | Qt-067e3fb0868814351829647358dea583d28d010e.zip Qt-067e3fb0868814351829647358dea583d28d010e.tar.gz Qt-067e3fb0868814351829647358dea583d28d010e.tar.bz2 | |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-staging into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-staging:
Supporting parallel pointer event delivery on Symbian
Removed unix specific mmap use from QString benchmark
Diffstat (limited to 'tests')
| -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; |