diff options
| author | David Boddie <dboddie@trolltech.com> | 2009-11-24 15:22:19 (GMT) |
|---|---|---|
| committer | David Boddie <dboddie@trolltech.com> | 2009-11-24 15:22:19 (GMT) |
| commit | 97aa8ad5ec6b5d23ad023518db92fa91d5fa7fe0 (patch) | |
| tree | dd3645a6afc426a804e73df378c3d47906a8bcf9 /src/gui/widgets/qtabbar_p.h | |
| parent | 8eea9828289b842c8a300f1f4309d059b15fd7b0 (diff) | |
| parent | 792e43aa2607d21deeada4b9f14bb82dc96ad4ec (diff) | |
| download | Qt-97aa8ad5ec6b5d23ad023518db92fa91d5fa7fe0.zip Qt-97aa8ad5ec6b5d23ad023518db92fa91d5fa7fe0.tar.gz Qt-97aa8ad5ec6b5d23ad023518db92fa91d5fa7fe0.tar.bz2 | |
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6
Diffstat (limited to 'src/gui/widgets/qtabbar_p.h')
| -rw-r--r-- | src/gui/widgets/qtabbar_p.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/gui/widgets/qtabbar_p.h b/src/gui/widgets/qtabbar_p.h index 9f3285b..2e8fb6d 100644 --- a/src/gui/widgets/qtabbar_p.h +++ b/src/gui/widgets/qtabbar_p.h @@ -75,7 +75,7 @@ class QTabBarPrivate : public QWidgetPrivate public: QTabBarPrivate() :currentIndex(-1), pressedIndex(-1), shape(QTabBar::RoundedNorth), layoutDirty(false), - drawBase(true), scrollOffset(0), expanding(true), closeButtonOnTabs(false), + drawBase(true), scrollOffset(0), useScrollButtonsSetByUser(false) , expanding(true), closeButtonOnTabs(false), selectionBehaviorOnRemove(QTabBar::SelectRightTab), paintWithOffsets(true), movable(false), dragInProgress(false), documentMode(false), movingTab(0) #ifdef Q_WS_MAC @@ -187,6 +187,7 @@ public: QSize iconSize; Qt::TextElideMode elideMode; bool useScrollButtons; + bool useScrollButtonsSetByUser; bool expanding; bool closeButtonOnTabs; |