Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master-integration
authorQt Continuous Integration System <qt-info@nokia.com>
Wed, 28 Apr 2010 23:16:52 +0000 (01:16 +0200)
committerQt Continuous Integration System <qt-info@nokia.com>
Wed, 28 Apr 2010 23:16:52 +0000 (01:16 +0200)
commitbce30f246347b91261b6618cee71b0274dbf04d9
tree8723c84592e77c24b2416412591e8e98f15d8146
parent576cb12c36f24917d674f4c0bf240441b4ac9b43
parenteb4a3bbf2a780f87105c09d354adde04b0bf6ad8
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:
  Update changelog after last change.
  QTabBar: smaller minimumSizeHint in ElideMode, and unit-test.
  Fix tab stop in QPainter::drawText()
src/gui/widgets/qtabbar.cpp
tests/auto/qtabbar/tst_qtabbar.cpp