diff options
| author | Gunnar Sletta <gunnar.sletta@nokia.com> | 2010-11-19 14:24:08 (GMT) |
|---|---|---|
| committer | Gunnar Sletta <gunnar.sletta@nokia.com> | 2010-11-19 14:24:08 (GMT) |
| commit | e50e811461b54e07184af547f62aa44b3c5bb681 (patch) | |
| tree | 45541bc05471d6c49305afeafa13f69031ccdecd /tests/auto/qwaitcondition/tst_qwaitcondition.cpp | |
| parent | 05b65c2f9df1c2c56c72f313401a6adb422d381b (diff) | |
| parent | b115770cc3bba68740a6848c7ccaed932399aca9 (diff) | |
| download | Qt-e50e811461b54e07184af547f62aa44b3c5bb681.zip Qt-e50e811461b54e07184af547f62aa44b3c5bb681.tar.gz Qt-e50e811461b54e07184af547f62aa44b3c5bb681.tar.bz2 | |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt
Conflicts:
src/gui/text/qfontengine_mac.mm
src/gui/text/qfontengine_p.h
Diffstat (limited to 'tests/auto/qwaitcondition/tst_qwaitcondition.cpp')
| -rw-r--r-- | tests/auto/qwaitcondition/tst_qwaitcondition.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/auto/qwaitcondition/tst_qwaitcondition.cpp b/tests/auto/qwaitcondition/tst_qwaitcondition.cpp index 5391591..ffc4730 100644 --- a/tests/auto/qwaitcondition/tst_qwaitcondition.cpp +++ b/tests/auto/qwaitcondition/tst_qwaitcondition.cpp @@ -76,7 +76,7 @@ private slots: static const int iterations = 10; // Note: some tests rely on ThreadCount being multiple of 2 -#ifdef Q_OS_SOLARIS +#if defined(Q_OS_SOLARIS) || ( defined(Q_OS_LINUX) && defined(QT_ARCH_ARMV6) ) static const int ThreadCount = 4; #else static const int ThreadCount = 10; |