aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorJ-P Nurmi <jpnurmi@theqtcompany.com>2015-04-15 22:25:51 +0200
committerJ-P Nurmi <jpnurmi@theqtcompany.com>2015-04-15 20:29:43 +0000
commitfda12ac53971f4e7b267a08a69d11031614c8ed4 (patch)
treeeb8ba38702b5c6b0530e9f70467ecde0114a72aa /src
parent2f5e385effd0c12ab085e13d5a6e27cf5f7bee37 (diff)
Add missing QQuickButton::pressed() & released() signals
Change-Id: I5942457258e1c666a0d67dbc5a9a5611d4ed5967 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
Diffstat (limited to 'src')
-rw-r--r--src/controls/qquickbutton.cpp28
-rw-r--r--src/controls/qquickbutton_p.h2
2 files changed, 27 insertions, 3 deletions
diff --git a/src/controls/qquickbutton.cpp b/src/controls/qquickbutton.cpp
index 805af923..64d7057e 100644
--- a/src/controls/qquickbutton.cpp
+++ b/src/controls/qquickbutton.cpp
@@ -50,6 +50,24 @@ QT_BEGIN_NAMESPACE
TODO
*/
+/*!
+ \qmlsignal QtQuickControls2::Button::pressed()
+
+ TODO
+*/
+
+/*!
+ \qmlsignal QtQuickControls2::Button::released()
+
+ TODO
+*/
+
+/*!
+ \qmlsignal QtQuickControls2::Button::clicked()
+
+ TODO
+*/
+
QQuickButtonPrivate::QQuickButtonPrivate() :
pressed(false), label(Q_NULLPTR)
{
@@ -100,12 +118,16 @@ bool QQuickButton::isPressed() const
return d->pressed;
}
-void QQuickButton::setPressed(bool pressed)
+void QQuickButton::setPressed(bool isPressed)
{
Q_D(QQuickButton);
- if (d->pressed != pressed) {
- d->pressed = pressed;
+ if (d->pressed != isPressed) {
+ d->pressed = isPressed;
emit pressedChanged();
+ if (isPressed)
+ emit pressed();
+ else
+ emit released();
}
}
diff --git a/src/controls/qquickbutton_p.h b/src/controls/qquickbutton_p.h
index 4b30b4d3..ecd4b3d4 100644
--- a/src/controls/qquickbutton_p.h
+++ b/src/controls/qquickbutton_p.h
@@ -74,6 +74,8 @@ public:
void setLabel(QQuickItem *label);
Q_SIGNALS:
+ void pressed();
+ void released();
void clicked();
void textChanged();
void pressedChanged();