diff options
Diffstat (limited to 'src/widgets/widgets/qtabbar.cpp')
| -rw-r--r-- | src/widgets/widgets/qtabbar.cpp | 22 |
1 files changed, 19 insertions, 3 deletions
diff --git a/src/widgets/widgets/qtabbar.cpp b/src/widgets/widgets/qtabbar.cpp index 8af70d0f9c..5959dd0ae4 100644 --- a/src/widgets/widgets/qtabbar.cpp +++ b/src/widgets/widgets/qtabbar.cpp @@ -74,6 +74,23 @@ QT_BEGIN_NAMESPACE +namespace { +class CloseButton : public QAbstractButton +{ + Q_OBJECT + +public: + explicit CloseButton(QWidget *parent = 0); + + QSize sizeHint() const override; + QSize minimumSizeHint() const override + { return sizeHint(); } + void enterEvent(QEvent *event) override; + void leaveEvent(QEvent *event) override; + void paintEvent(QPaintEvent *event) override; +}; +} + QMovableTabWidget::QMovableTabWidget(QWidget *parent) : QWidget(parent) { @@ -2686,7 +2703,7 @@ void QTabBarPrivate::Tab::TabBarAnimation::updateCurrentValue(const QVariant &cu priv->moveTab(priv->tabList.indexOf(*tab), current.toInt()); } -void QTabBarPrivate::Tab::TabBarAnimation::updateState(QAbstractAnimation::State, QAbstractAnimation::State newState) +void QTabBarPrivate::Tab::TabBarAnimation::updateState(QAbstractAnimation::State newState, QAbstractAnimation::State) { if (newState == Stopped) priv->moveTabFinished(priv->tabList.indexOf(*tab)); } @@ -2695,5 +2712,4 @@ void QTabBarPrivate::Tab::TabBarAnimation::updateState(QAbstractAnimation::State QT_END_NAMESPACE #include "moc_qtabbar.cpp" - -#include "moc_qtabbar_p.cpp" +#include "qtabbar.moc" |