1
mirror of https://invent.kde.org/network/falkon.git synced 2024-12-20 10:46:35 +01:00

Fixed compilation with Qt 5

This commit is contained in:
nowrep 2013-12-24 17:21:10 +01:00
parent ba4cbf194f
commit 33615d3f32
2 changed files with 3 additions and 3 deletions

View File

@ -182,13 +182,13 @@ QRect ComboTabBar::tabRect(int index) const
rect.moveLeft(rect.x() + mapFromGlobal(m_mainTabBar->mapToGlobal(QPoint(0, 0))).x());
QRect widgetRect = m_mainTabBarWidget->scrollArea()->viewport()->rect();
widgetRect.moveLeft(widgetRect.x() + mapFromGlobal(m_mainTabBarWidget->scrollArea()->viewport()->mapToGlobal(QPoint(0, 0))).x());
rect = rect.intersect(widgetRect);
rect = rect.intersected(widgetRect);
}
else {
rect.moveLeft(rect.x() + mapFromGlobal(m_pinnedTabBar->mapToGlobal(QPoint(0, 0))).x());
QRect widgetRect = m_pinnedTabBarWidget->scrollArea()->viewport()->rect();
widgetRect.moveLeft(widgetRect.x() + mapFromGlobal(m_pinnedTabBarWidget->scrollArea()->viewport()->mapToGlobal(QPoint(0, 0))).x());
rect = rect.intersect(widgetRect);
rect = rect.intersected(widgetRect);
}
}

View File

@ -24,10 +24,10 @@
#include <QScrollBar>
#include <QAbstractButton>
#include <QEasingCurve>
#include <QStyleOption>
class QScrollArea;
class QPropertyAnimation;
class QStyleOptionTabBarBaseV2;
class QHBoxLayout;
class TabBarScrollWidget;