diff options
author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-05-05 12:04:34 (GMT) |
---|---|---|
committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-05-05 12:04:34 (GMT) |
commit | 717e96cc790c173a4555077741d37f42a3dd6cba (patch) | |
tree | 0b198d720c112d2cd2018a7848aa8d1ef48a5ad9 /tests/auto/qabstractsocket | |
parent | a8ba2f12d520ac5001f823ccf4f751c91bd105d5 (diff) | |
parent | 154dbc010735d6c7aed89398757b1ad566ca67ea (diff) | |
download | Qt-717e96cc790c173a4555077741d37f42a3dd6cba.zip Qt-717e96cc790c173a4555077741d37f42a3dd6cba.tar.gz Qt-717e96cc790c173a4555077741d37f42a3dd6cba.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:
Skip failing auto-test on Mac and Linux QWS
Update changelog after last change.
QTabBar: smaller minimumSizeHint in ElideMode, and unit-test.
Fix tab stop in QPainter::drawText()
Diffstat (limited to 'tests/auto/qabstractsocket')
0 files changed, 0 insertions, 0 deletions