diff options
author | Sean Harmer <sean.harmer@kdab.com> | 2017-05-24 12:09:44 +0100 |
---|---|---|
committer | Sean Harmer <sean.harmer@kdab.com> | 2017-05-24 12:10:02 +0100 |
commit | 77d294db076dac19e8b549b445ffede9f7260c84 (patch) | |
tree | 828ee7a6862ec5c0bd24f97cb540625a2c647376 /src/input/frontend/qinputsequence.cpp | |
parent | 59f8fec8a41606b3185fe3a4e276978e3e1ed5ef (diff) | |
parent | 939b9b4b7591e8a421cf048a0a84ed3e75d81d21 (diff) | |
download | qt3d-wip/animation.tar.gz |
Merge branch 'dev' into wip/animationwip/animation
Change-Id: I6e770609c90a7745d08fa4e2f424e865678c5d6f
Diffstat (limited to 'src/input/frontend/qinputsequence.cpp')
-rw-r--r-- | src/input/frontend/qinputsequence.cpp | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/src/input/frontend/qinputsequence.cpp b/src/input/frontend/qinputsequence.cpp index 99eff289b..766674840 100644 --- a/src/input/frontend/qinputsequence.cpp +++ b/src/input/frontend/qinputsequence.cpp @@ -38,13 +38,15 @@ #include "qinputsequence.h" #include "qinputsequence_p.h" -#include <Qt3DCore/private/qnode_p.h> -#include <Qt3DCore/qnodecreatedchange.h> -#include <Qt3DInput/qabstractphysicaldevice.h> + #include <Qt3DInput/qabstractactioninput.h> -#include <Qt3DCore/qpropertyupdatedchange.h> +#include <Qt3DInput/qabstractphysicaldevice.h> +#include <Qt3DCore/qnodecreatedchange.h> #include <Qt3DCore/qpropertynodeaddedchange.h> #include <Qt3DCore/qpropertynoderemovedchange.h> +#include <Qt3DCore/qpropertyupdatedchange.h> + +#include <Qt3DCore/private/qnode_p.h> QT_BEGIN_NAMESPACE @@ -74,7 +76,7 @@ QInputSequencePrivate::QInputSequencePrivate() Represents a set of QAbstractActionInput's that must be triggerd one after the other. - The following example shows a chord that will be triggered by pressing the A and S keys together with a tolerence of 10 miliseconds between presses. + The following example shows a chord that will be triggered by pressing the A and S keys together with a tolerance of 10 miliseconds between presses. \qml InputChord { tolerance: 10 |