diff options
| author | ninerider <qt-info@nokia.com> | 2009-11-23 12:28:19 (GMT) |
|---|---|---|
| committer | ninerider <qt-info@nokia.com> | 2009-11-23 12:28:19 (GMT) |
| commit | 4cfc3a884835667fe8c3a6aa745dc4ace34794e4 (patch) | |
| tree | 553a33b8112750d1d2dd7dc503c9c70391538b07 /src/gui/widgets/qtabbar_p.h | |
| parent | cda63c368dbb5acd040e2190db8f25de69462d8e (diff) | |
| parent | 4112771f56e827d1d8fbde0995ebf5b0242c01a8 (diff) | |
| download | Qt-4cfc3a884835667fe8c3a6aa745dc4ace34794e4.zip Qt-4cfc3a884835667fe8c3a6aa745dc4ace34794e4.tar.gz Qt-4cfc3a884835667fe8c3a6aa745dc4ace34794e4.tar.bz2 | |
Merge remote branch 'origin/4.6' into 4.6-ce
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; |