summaryrefslogtreecommitdiffstats
path: root/tests/auto/qscriptengine/tst_qscriptengine.cpp
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2010-11-19 03:37:07 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2010-11-19 03:37:07 (GMT)
commitb33c2c2297a76568a0d204a787b1d76029552886 (patch)
treeac7900cd868ad1cc8da52b491921ace02166215a /tests/auto/qscriptengine/tst_qscriptengine.cpp
parentb115770cc3bba68740a6848c7ccaed932399aca9 (diff)
parent3b80b70d1464320aee2b38ddeb1ec0d257f6bd1c (diff)
downloadQt-b33c2c2297a76568a0d204a787b1d76029552886.zip
Qt-b33c2c2297a76568a0d204a787b1d76029552886.tar.gz
Qt-b33c2c2297a76568a0d204a787b1d76029552886.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: Resolve two save/restore geometry issues on X11. Split newQObject tests into smaller chunks. Compile fix Don't destroy Qt's internal pthread_key_t if it was not initialized
Diffstat (limited to 'tests/auto/qscriptengine/tst_qscriptengine.cpp')
0 files changed, 0 insertions, 0 deletions