diff options
Diffstat (limited to 'src/widgets/widgets/qtabbar.cpp')
| -rw-r--r-- | src/widgets/widgets/qtabbar.cpp | 39 |
1 files changed, 0 insertions, 39 deletions
diff --git a/src/widgets/widgets/qtabbar.cpp b/src/widgets/widgets/qtabbar.cpp index bf9c7ccb92..d8dc4347d8 100644 --- a/src/widgets/widgets/qtabbar.cpp +++ b/src/widgets/widgets/qtabbar.cpp @@ -67,10 +67,6 @@ #include <private/qt_cocoa_helpers_mac_p.h> #endif -#ifndef QT_NO_STYLE_S60 -#include "qs60style.h" -#endif - QT_BEGIN_NAMESPACE @@ -495,9 +491,6 @@ void QTabBarPrivate::layoutTabs() if (useScrollButtons && tabList.count() && last > available) { int extra = extraWidth(); -#ifndef QT_NO_STYLE_S60 - QS60Style *s60Style = qobject_cast<QS60Style*>(QApplication::style()); -#endif if (!vertTabs) { Qt::LayoutDirection ld = q->layoutDirection(); QRect arrows = QStyle::visualRect(ld, q->rect(), @@ -505,57 +498,25 @@ void QTabBarPrivate::layoutTabs() int buttonOverlap = q->style()->pixelMetric(QStyle::PM_TabBar_ScrollButtonOverlap, 0, q); if (ld == Qt::LeftToRight) { -// In S60style, tab scroll buttons are layoutted separately, on the sides of the tabbar. -#ifndef QT_NO_STYLE_S60 - if (s60Style) { - rightB->setGeometry(arrows.left() + extra / 2, arrows.top(), extra / 2, arrows.height()); - leftB->setGeometry(0, arrows.top(), extra / 2, arrows.height()); - } else { -#endif leftB->setGeometry(arrows.left(), arrows.top(), extra/2, arrows.height()); rightB->setGeometry(arrows.right() - extra/2 + buttonOverlap, arrows.top(), extra/2, arrows.height()); -#ifndef QT_NO_STYLE_S60 - } -#endif leftB->setArrowType(Qt::LeftArrow); rightB->setArrowType(Qt::RightArrow); } else { -#ifndef QT_NO_STYLE_S60 - if (s60Style) { - rightB->setGeometry(arrows.left() + extra / 2, arrows.top(), extra / 2, arrows.height()); - leftB->setGeometry(0, arrows.top(), extra / 2, arrows.height()); - } else { -#endif rightB->setGeometry(arrows.left(), arrows.top(), extra/2, arrows.height()); leftB->setGeometry(arrows.right() - extra/2 + buttonOverlap, arrows.top(), extra/2, arrows.height()); -#ifndef QT_NO_STYLE_S60 - } -#endif rightB->setArrowType(Qt::LeftArrow); leftB->setArrowType(Qt::RightArrow); } } else { -#ifndef QT_NO_STYLE_S60 - if (s60Style) { - QRect arrows = QRect(0, 0, size.width(), available ); - leftB->setGeometry(arrows.left(), arrows.top(), arrows.width(), extra / 2); - leftB->setArrowType(Qt::UpArrow); - rightB->setGeometry(arrows.left(), arrows.bottom() - extra / 2 + 1, - arrows.width(), extra / 2); - rightB->setArrowType(Qt::DownArrow); - } else { -#endif QRect arrows = QRect(0, available - extra, size.width(), extra ); leftB->setGeometry(arrows.left(), arrows.top(), arrows.width(), extra/2); leftB->setArrowType(Qt::UpArrow); rightB->setGeometry(arrows.left(), arrows.bottom() - extra/2 + 1, arrows.width(), extra/2); rightB->setArrowType(Qt::DownArrow); -#ifndef QT_NO_STYLE_S60 - } -#endif } leftB->setEnabled(scrollOffset > 0); rightB->setEnabled(last - scrollOffset >= available - extra); |