diff options
author | Mitch Curtis <mitch.curtis@theqtcompany.com> | 2016-04-26 15:51:50 +0200 |
---|---|---|
committer | J-P Nurmi <jpnurmi@qt.io> | 2016-04-27 16:02:50 +0000 |
commit | d6b32468667a4890cef6061f08c353a0d0cba43e (patch) | |
tree | 270287bd5725b4de6a8edc1b2809eb4adbd51e65 /src/quicktemplates2/qquickabstractbutton.cpp | |
parent | 9e79b19a305960a3df7bd1c90675ba00cd972153 (diff) |
Move highlighted to subclasses that actually use it
Change-Id: I70468b35b2a3a03c6e2d557a67443291697c8b42
Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
Diffstat (limited to 'src/quicktemplates2/qquickabstractbutton.cpp')
-rw-r--r-- | src/quicktemplates2/qquickabstractbutton.cpp | 28 |
1 files changed, 1 insertions, 27 deletions
diff --git a/src/quicktemplates2/qquickabstractbutton.cpp b/src/quicktemplates2/qquickabstractbutton.cpp index 9cfd9b40..68d11bae 100644 --- a/src/quicktemplates2/qquickabstractbutton.cpp +++ b/src/quicktemplates2/qquickabstractbutton.cpp @@ -105,7 +105,7 @@ static const int AUTO_REPEAT_INTERVAL = 100; QQuickAbstractButtonPrivate::QQuickAbstractButtonPrivate() : down(false), explicitDown(false), pressed(false), checked(false), checkable(false), - highlighted(false), autoExclusive(false), autoRepeat(false), wasHeld(false), + autoExclusive(false), autoRepeat(false), wasHeld(false), holdTimer(0), delayTimer(0), repeatTimer(0), repeatButton(Qt::NoButton), indicator(nullptr), group(nullptr) { } @@ -374,32 +374,6 @@ void QQuickAbstractButton::setCheckable(bool checkable) } /*! - \qmlproperty bool QtQuick.Controls::AbstractButton::highlighted - - This property holds whether the button is highlighted. - - A button can be highlighted in order to draw the user's attention towards - it. It has no effect on keyboard interaction. - - The default value is \c false. -*/ -bool QQuickAbstractButton::isHighlighted() const -{ - Q_D(const QQuickAbstractButton); - return d->highlighted; -} - -void QQuickAbstractButton::setHighlighted(bool highlighted) -{ - Q_D(QQuickAbstractButton); - if (highlighted == d->highlighted) - return; - - d->highlighted = highlighted; - emit highlightedChanged(); -} - -/*! \qmlproperty bool QtQuick.Controls::AbstractButton::autoExclusive This property holds whether auto-exclusivity is enabled. |