diff options
| author | J-P Nurmi <jpnurmi@qt.io> | 2017-11-06 14:02:21 +0100 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@qt.io> | 2017-11-06 14:02:21 +0100 |
| commit | c39b126a77e27296ef82a1634753c775cc5a93fb (patch) | |
| tree | 235d9568e21e59b7c70f8be81518c3ea184cf552 /src/quicktemplates2/qquickspinbox.cpp | |
| parent | dc2603562a36241c9beac0c9c4c08bcbfed7b6a2 (diff) | |
| parent | 430fe83ecb7106118cbebd735637aee9e9253914 (diff) | |
Merge remote-tracking branch 'origin/5.9' into 5.10
Conflicts:
src/quicktemplates2/qquickabstractbutton_p.h
src/quicktemplates2/qquickbuttongroup_p.h
src/quicktemplates2/qquickrangeslider.cpp
src/quicktemplates2/qquickrangeslider_p.h
src/quicktemplates2/qquickswipeview_p.h
src/quicktemplates2/qquicktextarea.cpp
src/quicktemplates2/qquicktextarea_p.h
src/quicktemplates2/qquicktextfield_p.h
Change-Id: I7cba8783b1dd85a4db534222e36572ee05dd01d0
Diffstat (limited to 'src/quicktemplates2/qquickspinbox.cpp')
| -rw-r--r-- | src/quicktemplates2/qquickspinbox.cpp | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/src/quicktemplates2/qquickspinbox.cpp b/src/quicktemplates2/qquickspinbox.cpp index aaf0fbad..ef1c9d97 100644 --- a/src/quicktemplates2/qquickspinbox.cpp +++ b/src/quicktemplates2/qquickspinbox.cpp @@ -978,22 +978,6 @@ void QQuickSpinButton::setPressed(bool pressed) emit pressedChanged(); } -bool QQuickSpinButton::isHovered() const -{ - Q_D(const QQuickSpinButton); - return d->hovered; -} - -void QQuickSpinButton::setHovered(bool hovered) -{ - Q_D(QQuickSpinButton); - if (d->hovered == hovered) - return; - - d->hovered = hovered; - emit hoveredChanged(); -} - QQuickItem *QQuickSpinButton::indicator() const { Q_D(const QQuickSpinButton); @@ -1016,4 +1000,20 @@ void QQuickSpinButton::setIndicator(QQuickItem *indicator) emit indicatorChanged(); } +bool QQuickSpinButton::isHovered() const +{ + Q_D(const QQuickSpinButton); + return d->hovered; +} + +void QQuickSpinButton::setHovered(bool hovered) +{ + Q_D(QQuickSpinButton); + if (d->hovered == hovered) + return; + + d->hovered = hovered; + emit hoveredChanged(); +} + QT_END_NAMESPACE |