diff options
| author | Thiago Macieira <thiago.macieira@nokia.com> | 2009-11-25 19:20:45 +0100 |
|---|---|---|
| committer | Thiago Macieira <thiago.macieira@nokia.com> | 2009-11-25 19:20:45 +0100 |
| commit | e58b7f0cc139c5fda3d472c38161be8fb718db7d (patch) | |
| tree | 3c20cccfe050d125a5f4736ba11b6383e8734be4 /src/gui/widgets/qtabbar_p.h | |
| parent | c2a4a1b1e06f8b0d02e7b56c9eb0c19fd2fae80a (diff) | |
| parent | 4c3539dfbc65d5decdd842d4181f9aa3d38d213c (diff) | |
| download | qt4-tools-e58b7f0cc139c5fda3d472c38161be8fb718db7d.tar.gz | |
Merge branch '4.6'
Conflicts:
doc/src/modules.qdoc
examples/assistant/simpletextviewer/findfiledialog.cpp
examples/webkit/fancybrowser/mainwindow.cpp
src/gui/widgets/qtabbar.cpp
src/gui/widgets/qtabbar_p.h
tests/auto/qpixmap/tst_qpixmap.cpp
tools/assistant/compat/helpdialog.cpp
tools/assistant/compat/tabbedbrowser.cpp
translations/translations.pri
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 2854cde5ed..d54032fcc1 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), elideModeSetByUser(false), expanding(true), closeButtonOnTabs(false), + drawBase(true), scrollOffset(0), elideModeSetByUser(false), useScrollButtonsSetByUser(false), expanding(true), closeButtonOnTabs(false), selectionBehaviorOnRemove(QTabBar::SelectRightTab), paintWithOffsets(true), movable(false), dragInProgress(false), documentMode(false), movingTab(0) #ifdef Q_WS_MAC @@ -188,6 +188,7 @@ public: Qt::TextElideMode elideMode; bool elideModeSetByUser; bool useScrollButtons; + bool useScrollButtonsSetByUser; bool expanding; bool closeButtonOnTabs; |