diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-08-10 17:43:12 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-08-10 17:43:13 +0200 |
| commit | 8ba384a5645aebbefe34b814828024d511171497 (patch) | |
| tree | 6f6cfe1b849b6e0e02de15ee74ad0f3d5fc740b6 /src/widgets/widgets/qtabbar_p.h | |
| parent | e694ced803589b3504b6bdb2fc8bf97bc891c794 (diff) | |
| parent | 25b72a63fffe800f2005b21d254b0b191d263b10 (diff) | |
Merge remote-tracking branch 'origin/5.6' into 5.7
Change-Id: I1a63523de158757964b6fb5ea026cf69a6c5ddcf
Diffstat (limited to 'src/widgets/widgets/qtabbar_p.h')
| -rw-r--r-- | src/widgets/widgets/qtabbar_p.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/widgets/widgets/qtabbar_p.h b/src/widgets/widgets/qtabbar_p.h index 48f235f050..a73c3e11e2 100644 --- a/src/widgets/widgets/qtabbar_p.h +++ b/src/widgets/widgets/qtabbar_p.h @@ -165,6 +165,7 @@ public: #endif //QT_NO_ANIMATION }; QList<Tab> tabList; + mutable QHash<QString, QSize> textSizes; int calculateNewPosition(int from, int to, int index) const; void slide(int from, int to); @@ -198,6 +199,8 @@ public: void autoHideTabs(); QRect normalizedScrollRect(int index = -1); + void initBasicStyleOption(QStyleOptionTab *option, int tabIndex) const; + void makeVisible(int index); QSize iconSize; Qt::TextElideMode elideMode; |