diff options
| author | Simon Hausmann <simon.hausmann@nokia.com> | 2009-05-07 00:04:41 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@nokia.com> | 2009-05-07 00:04:41 +0200 |
| commit | 014b5d404b19ad3d81686ba490eb7dd93efee573 (patch) | |
| tree | 8fce9f8b172d4982270c5a91da0aa66fcb589f05 /src/gui/widgets/qtabbar.cpp | |
| parent | 2eb0312c96ab828809158802d4cb7e0980227389 (diff) | |
| parent | 311978919f63c2c23dd09b4743ff12cf2a8a47bb (diff) | |
| download | qt4-tools-014b5d404b19ad3d81686ba490eb7dd93efee573.tar.gz | |
Merge branch '4.5' of git@scm.dev.troll.no:qt/qt
Conflicts:
src/gui/kernel/qcocoaview_mac_p.h
src/gui/widgets/qmainwindow.cpp
Diffstat (limited to 'src/gui/widgets/qtabbar.cpp')
| -rw-r--r-- | src/gui/widgets/qtabbar.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/gui/widgets/qtabbar.cpp b/src/gui/widgets/qtabbar.cpp index ce1ac0948d..0b4ce9d0ac 100644 --- a/src/gui/widgets/qtabbar.cpp +++ b/src/gui/widgets/qtabbar.cpp @@ -1084,7 +1084,7 @@ void QTabBar::setTabData(int index, const QVariant & data) } /*! - Returns the datad of the tab at position \a index, or a null + Returns the data of the tab at position \a index, or a null variant if \a index is out of range. */ QVariant QTabBar::tabData(int index) const @@ -2223,6 +2223,7 @@ void QTabBar::setTabButton(int index, ButtonPosition position, QWidget *widget) d->tabList[index].rightWidget = widget; } d->layoutTabs(); + d->refresh(); update(); } |