From b02141091db3d5182aab6728f02239fce2c727af Mon Sep 17 00:00:00 2001
From: Robert Brock <robert.brock@kdab.com>
Date: Tue, 17 Jan 2017 12:01:25 +0000
Subject: Coding convention fix for Src/input

Reordering the header includes to comply with Qt coding conventions

Task-number: QTBUG-56185
Change-Id: I1d1b61c2fac42505f85a1c4421e1292259270568
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
---
 src/input/frontend/qinputsequence.cpp | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

(limited to 'src/input/frontend/qinputsequence.cpp')

diff --git a/src/input/frontend/qinputsequence.cpp b/src/input/frontend/qinputsequence.cpp
index 99eff289b..17499b59b 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
 
-- 
cgit v1.2.1


From d9b4b28c5383a5d338a670e48aa1a4e4ba9fa3d9 Mon Sep 17 00:00:00 2001
From: Andy Maloney <asmaloney@gmail.com>
Date: Wed, 22 Mar 2017 11:24:42 -0400
Subject: Fix spelling in comments and docs

Change-Id: Ib93da3bc94ee43980d1190955c8c37e886c4b0fa
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
---
 src/input/frontend/qinputsequence.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/input/frontend/qinputsequence.cpp')

diff --git a/src/input/frontend/qinputsequence.cpp b/src/input/frontend/qinputsequence.cpp
index 17499b59b..766674840 100644
--- a/src/input/frontend/qinputsequence.cpp
+++ b/src/input/frontend/qinputsequence.cpp
@@ -76,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
-- 
cgit v1.2.1