diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-09-26 12:24:57 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-09-26 12:24:57 (GMT) |
| commit | e2e2ee6684931bb0325d4b973709a315f7477cb2 (patch) | |
| tree | cfc34761b3cb6816187def9ad59eb4b59f8e95ef /tests | |
| parent | e2f475b0e32d302ea8b755e7c16274077b454725 (diff) | |
| parent | 140e68ae50411631aa5c1649face4c7d9d1b651d (diff) | |
| download | Qt-e2e2ee6684931bb0325d4b973709a315f7477cb2.zip Qt-e2e2ee6684931bb0325d4b973709a315f7477cb2.tar.gz Qt-e2e2ee6684931bb0325d4b973709a315f7477cb2.tar.bz2 | |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
Fix broken qglthreads autotest build on Solaris.
Don't store the alignment attribute for spacers
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/auto/qglthreads/tst_qglthreads.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/tests/auto/qglthreads/tst_qglthreads.cpp b/tests/auto/qglthreads/tst_qglthreads.cpp index 859f47f..60fb10c 100644 --- a/tests/auto/qglthreads/tst_qglthreads.cpp +++ b/tests/auto/qglthreads/tst_qglthreads.cpp @@ -49,6 +49,7 @@ #include <unistd.h> // for usleep #define RUNNING_TIME 2000 // save GPU mem by running shorter time. #else +#include "qplatformdefs.h" // for usleep #define RUNNING_TIME 5000 #endif |