diff options
| author | Kevin Ottens <kevin.ottens@kdab.com> | 2016-08-24 16:16:36 +0200 |
|---|---|---|
| committer | Sean Harmer <sean.harmer@kdab.com> | 2016-08-24 19:33:31 +0000 |
| commit | 1f276f1d346a6fdde8c596571a4606ff61fb7ff3 (patch) | |
| tree | bcf51bc439b60a4dc812488fbfd747e5f36c259a | |
| parent | c899e0f334f02c1483665cf4cca10cbfaf3b7d18 (diff) | |
Fix spurious sequence trigger on first key press
Change-Id: I2c8a34009d3bac400f5e156fe6321af744960de5
Task-Id: QTBUG-54585
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
| -rw-r--r-- | src/input/backend/inputsequence.cpp | 1 | ||||
| -rw-r--r-- | tests/auto/input/inputsequence/tst_inputsequence.cpp | 11 |
2 files changed, 5 insertions, 7 deletions
diff --git a/src/input/backend/inputsequence.cpp b/src/input/backend/inputsequence.cpp index f9771d066..140a8fe64 100644 --- a/src/input/backend/inputsequence.cpp +++ b/src/input/backend/inputsequence.cpp @@ -71,6 +71,7 @@ void InputSequence::initializeFromPeer(const Qt3DCore::QNodeCreatedChangeBasePtr m_sequences = data.sequenceIds; m_timeout = data.timeout; m_buttonInterval = data.buttonInterval; + m_inputsToTrigger = m_sequences; } void InputSequence::cleanup() diff --git a/tests/auto/input/inputsequence/tst_inputsequence.cpp b/tests/auto/input/inputsequence/tst_inputsequence.cpp index 3adbe601d..442173d0c 100644 --- a/tests/auto/input/inputsequence/tst_inputsequence.cpp +++ b/tests/auto/input/inputsequence/tst_inputsequence.cpp @@ -202,8 +202,7 @@ private Q_SLOTS: deviceBackend->setButtonPressed(Qt::Key_Q, true); // THEN - QCOMPARE(backendInputSequence.process(&handler, 1000000100), true); // Yes, that's a bug - QCOMPARE(backendInputSequence.process(&handler, 1000000150), false); + QCOMPARE(backendInputSequence.process(&handler, 1000000100), false); // WHEN deviceBackend->setButtonPressed(Qt::Key_Q, false); @@ -321,8 +320,7 @@ private Q_SLOTS: deviceBackend->setButtonPressed(Qt::Key_Q, true); // THEN - QCOMPARE(backendInputSequence.process(&handler, 1000000100), true); // Yes, that's a bug - QCOMPARE(backendInputSequence.process(&handler, 1000000150), false); + QCOMPARE(backendInputSequence.process(&handler, 1000000100), false); // WHEN deviceBackend->setButtonPressed(Qt::Key_Q, false); @@ -379,8 +377,7 @@ private Q_SLOTS: deviceBackend->setButtonPressed(Qt::Key_Q, true); // THEN - QCOMPARE(backendInputSequence.process(&handler, 1000000100), true); // Yes, that's a bug - QCOMPARE(backendInputSequence.process(&handler, 1000000150), false); + QCOMPARE(backendInputSequence.process(&handler, 1000000100), false); // WHEN deviceBackend->setButtonPressed(Qt::Key_Q, false); @@ -394,7 +391,7 @@ private Q_SLOTS: deviceBackend->setButtonPressed(Qt::Key_E, true); // THEN - QCOMPARE(backendInputSequence.process(&handler, 1000000300), true); // Yes, that's yet another bug + QCOMPARE(backendInputSequence.process(&handler, 1000000300), false); } }; |