diff options
| author | Bradley T. Hughes <bradley.hughes@nokia.com> | 2009-10-28 09:03:25 (GMT) |
|---|---|---|
| committer | Bradley T. Hughes <bradley.hughes@nokia.com> | 2009-10-28 09:03:25 (GMT) |
| commit | 2ecf21f48b9d328b4d732848d1d20115d1891c42 (patch) | |
| tree | 1fe81d9a4fc5640dca29ebf5ca2e048d805dda15 /src/gui/widgets/qtabbar_p.h | |
| parent | 1ec19ed5a69b8b0e11c81037c270072736f48e40 (diff) | |
| parent | 0313ccbfaff690c5a8fc18a3a2c7d976a4a55aaf (diff) | |
| download | Qt-2ecf21f48b9d328b4d732848d1d20115d1891c42.zip Qt-2ecf21f48b9d328b4d732848d1d20115d1891c42.tar.gz Qt-2ecf21f48b9d328b4d732848d1d20115d1891c42.tar.bz2 | |
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-platform-team into 4.6-WM_NULL-driven
Diffstat (limited to 'src/gui/widgets/qtabbar_p.h')
| -rw-r--r-- | src/gui/widgets/qtabbar_p.h | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/src/gui/widgets/qtabbar_p.h b/src/gui/widgets/qtabbar_p.h index 494a340..9f3285b 100644 --- a/src/gui/widgets/qtabbar_p.h +++ b/src/gui/widgets/qtabbar_p.h @@ -77,7 +77,11 @@ public: :currentIndex(-1), pressedIndex(-1), shape(QTabBar::RoundedNorth), layoutDirty(false), drawBase(true), scrollOffset(0), expanding(true), closeButtonOnTabs(false), selectionBehaviorOnRemove(QTabBar::SelectRightTab), paintWithOffsets(true), movable(false), - dragInProgress(false), documentMode(false), movingTab(0) {} + dragInProgress(false), documentMode(false), movingTab(0) +#ifdef Q_WS_MAC + , previousPressedIndex(-1) +#endif + {} int currentIndex; int pressedIndex; @@ -195,7 +199,9 @@ public: bool documentMode; QWidget *movingTab; - +#ifdef Q_WS_MAC + int previousPressedIndex; +#endif // shared by tabwidget and qtabbar static void initStyleBaseOption(QStyleOptionTabBarBaseV2 *optTabBase, QTabBar *tabbar, QSize size) { |