From 1f276f1d346a6fdde8c596571a4606ff61fb7ff3 Mon Sep 17 00:00:00 2001 From: Kevin Ottens Date: Wed, 24 Aug 2016 16:16:36 +0200 Subject: Fix spurious sequence trigger on first key press Change-Id: I2c8a34009d3bac400f5e156fe6321af744960de5 Task-Id: QTBUG-54585 Reviewed-by: Sean Harmer --- src/input/backend/inputsequence.cpp | 1 + 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); } }; -- cgit v1.2.3