diff options
author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-02-10 11:18:21 (GMT) |
---|---|---|
committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-02-10 11:18:21 (GMT) |
commit | 39932fe5f540634d33acd68bfbcd4fb74283ca65 (patch) | |
tree | 61afa6428577d2f62575e69eafb55f26f14f49b5 /tests/auto/qwaitcondition | |
parent | f57a2756ebfb48c2fad94c0c319fa181d2af4dfd (diff) | |
parent | caf93a2b6d3df012055ab70ad4bba1bb7b29141d (diff) | |
download | Qt-39932fe5f540634d33acd68bfbcd4fb74283ca65.zip Qt-39932fe5f540634d33acd68bfbcd4fb74283ca65.tar.gz Qt-39932fe5f540634d33acd68bfbcd4fb74283ca65.tar.bz2 |
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
Apply newly generated test values.
Add new test values to QScriptValue test generator.
Fix an unhandled exception in QScriptValue's test generator.
Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ( 36fe058a9001e6d47f0fd41c6304cdfdf3a735ed )
Cannot drag actions in Designer on Mac OS X/Cocoa.
Diffstat (limited to 'tests/auto/qwaitcondition')
0 files changed, 0 insertions, 0 deletions