diff options
| author | Water-Team <water@pad.test.qt.nokia.com> | 2011-08-31 23:00:13 (GMT) |
|---|---|---|
| committer | Water-Team <water@pad.test.qt.nokia.com> | 2011-08-31 23:00:13 (GMT) |
| commit | aa31031ca88d8db0c1c997d50fb789dbe0cb9b55 (patch) | |
| tree | c3621fe5240e49fc1c260447b4d3cfbf453f07b6 /src/gui/widgets | |
| parent | 7fb04c5964e47e71b709a413be7839a3cedbba9e (diff) | |
| parent | f14bbde351d90bed520f9503500f922f7aa18c92 (diff) | |
| download | Qt-aa31031ca88d8db0c1c997d50fb789dbe0cb9b55.zip Qt-aa31031ca88d8db0c1c997d50fb789dbe0cb9b55.tar.gz Qt-aa31031ca88d8db0c1c997d50fb789dbe0cb9b55.tar.bz2 | |
Merge branch '4.8-upstream' into master-water
Diffstat (limited to 'src/gui/widgets')
| -rw-r--r-- | src/gui/widgets/qtabbar.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/widgets/qtabbar.cpp b/src/gui/widgets/qtabbar.cpp index 16e4aad..8faf156 100644 --- a/src/gui/widgets/qtabbar.cpp +++ b/src/gui/widgets/qtabbar.cpp @@ -171,7 +171,7 @@ void QTabBar::initStyleOption(QStyleOptionTab *option, int tabIndex) const if (tabIndex > 0 && tabIndex - 1 == d->currentIndex) option->selectedPosition = QStyleOptionTab::PreviousIsSelected; - else if (tabIndex < totalTabs - 1 && tabIndex + 1 == d->currentIndex) + else if (tabIndex + 1 < totalTabs && tabIndex + 1 == d->currentIndex) option->selectedPosition = QStyleOptionTab::NextIsSelected; else option->selectedPosition = QStyleOptionTab::NotAdjacent; |