summaryrefslogtreecommitdiffstats
path: root/src/input
diff options
context:
space:
mode:
authorLiang Qi <liang.qi@qt.io>2019-09-30 14:59:22 +0200
committerLiang Qi <liang.qi@qt.io>2019-09-30 14:59:22 +0200
commiteb9f68599f1d94b8ee578ea18b3e3e5297cce73d (patch)
treeab4d226556f83de7e24246f1995500be51533f04 /src/input
parent4bae053c5dd756444c415bd6ddb121f7e3873b83 (diff)
parentc40cccb0b4485045db61c2d4e825e33a68c58861 (diff)
Merge remote-tracking branch 'origin/5.13' into 5.14
Conflicts: src/render/texture/qtexture.cpp Change-Id: Ibc0b8d87c172ea8fac521b2c85d2b2a42c5fc290
Diffstat (limited to 'src/input')
-rw-r--r--src/input/frontend/qaxis.cpp4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/input/frontend/qaxis.cpp b/src/input/frontend/qaxis.cpp
index 01e28e9cf..1830c8005 100644
--- a/src/input/frontend/qaxis.cpp
+++ b/src/input/frontend/qaxis.cpp
@@ -83,6 +83,10 @@ namespace Qt3DInput {
QAxis::QAxis(Qt3DCore::QNode *parent)
: Qt3DCore::QNode(*new QAxisPrivate(), parent)
{
+ Q_D(QAxis);
+ connect(this, &QAxis::enabledChanged, [d]() {
+ d->setValue(0.);
+ });
}
/*! \internal */