diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2016-10-06 15:41:51 +0200 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2016-10-06 15:41:52 +0200 |
| commit | 50559ea3325c0215da155911836c0416d0027716 (patch) | |
| tree | 15c6a93f310e125cbbae710fef73b5b859c3fc20 /src/input | |
| parent | 8683c285d20a2235ed92d90ab14fed1c039bcdf3 (diff) | |
| parent | e7a846b61d4635a1524fa16ce029ce47bc378c7e (diff) | |
Merge 5.7 into 5.7.1
Change-Id: Ic6d5cf08de0765d1555ef4e41a404af4b818c5a0
Diffstat (limited to 'src/input')
| -rw-r--r-- | src/input/frontend/qbuttonaxisinput.cpp | 4 | ||||
| -rw-r--r-- | src/input/frontend/qbuttonaxisinput_p.h | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/src/input/frontend/qbuttonaxisinput.cpp b/src/input/frontend/qbuttonaxisinput.cpp index 6d95ad187..aaf1b6a1c 100644 --- a/src/input/frontend/qbuttonaxisinput.cpp +++ b/src/input/frontend/qbuttonaxisinput.cpp @@ -65,6 +65,8 @@ namespace Qt3DInput { */ /*! \qmlproperty real ButtonAxisInput::scale + Specifies how the axis output value is scaled. No scaling is applied by default + so it defaults to 1. */ /*! @@ -97,6 +99,8 @@ QButtonAxisInput::~QButtonAxisInput() /*! \property QButtonAxisInput::scale + Specifies how the axis output value is scaled. No scaling is applied by default + so it defaults to 1. */ void QButtonAxisInput::setScale(float scale) { diff --git a/src/input/frontend/qbuttonaxisinput_p.h b/src/input/frontend/qbuttonaxisinput_p.h index e56e58575..849498f06 100644 --- a/src/input/frontend/qbuttonaxisinput_p.h +++ b/src/input/frontend/qbuttonaxisinput_p.h @@ -62,7 +62,7 @@ class QButtonAxisInputPrivate : public QAbstractAxisInputPrivate public: QButtonAxisInputPrivate() : QAbstractAxisInputPrivate() - , m_scale(0.0f) + , m_scale(1.0f) , m_acceleration(-1.0f) , m_deceleration(-1.0f) {} |