diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-08-25 17:07:34 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-08-25 17:07:34 (GMT) |
| commit | bf340b9ee5058a64e1655c8d3f5089e02c431d22 (patch) | |
| tree | 5632d7fcb2ddac88c2e83806f208938c5d1eab59 /qmake | |
| parent | c98adf03d4d064e95fda85f56debe267953c3cd5 (diff) | |
| parent | 0f2ccef40532c578f80332df82af0b5232feab07 (diff) | |
| download | Qt-bf340b9ee5058a64e1655c8d3f5089e02c431d22.zip Qt-bf340b9ee5058a64e1655c8d3f5089e02c431d22.tar.gz Qt-bf340b9ee5058a64e1655c8d3f5089e02c431d22.tar.bz2 | |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Disable tst_QFutureWatcher::warnRace on Mac.
Add some comments to the new tests.
Rework some of the threaded tests a bit.
qdrawhelper: fix assert in fetchTransformedBilinear
Stabilize tst_QFutureWatcher::warnRace (second attempt)
Call eglReleaseThread() when a thread exits, and fix warnings.
Add a couple of GL thread tests.
Stabilize tst_QFutureWatcher::warnRace
QFutureWatcher: display a warning when connecting after calling setFuture()
Fix tabArray support for boundingRect measurement
Diffstat (limited to 'qmake')
0 files changed, 0 insertions, 0 deletions