summaryrefslogtreecommitdiffstats
path: root/src/imports
diff options
context:
space:
mode:
authorUlf Hermann <ulf.hermann@qt.io>2017-02-08 11:21:23 +0100
committerUlf Hermann <ulf.hermann@qt.io>2017-02-08 10:59:09 +0000
commit6127d87db2f68a322ee8cea11872f2989f085400 (patch)
tree49eb30cf751891ef07df2b921a234779d22d8b7f /src/imports
parent7ffc36ef46e7ad14398359c1b0405ff291b9719b (diff)
Reformat include statements in accordance with coding conventions
Also, drop the QStateMachine includes. We certainly don't need them anymore. Change-Id: I1fe99162c68668858024516f937ee66ca6eff0bc Task-number: QTBUG-58658 Reviewed-by: Erik Verbruggen <erik.verbruggen@qt.io>
Diffstat (limited to 'src/imports')
-rw-r--r--src/imports/scxmlstatemachine/plugin.cpp2
-rw-r--r--src/imports/scxmlstatemachine/statemachineloader.cpp10
-rw-r--r--src/imports/scxmlstatemachine/statemachineloader_p.h2
3 files changed, 7 insertions, 7 deletions
diff --git a/src/imports/scxmlstatemachine/plugin.cpp b/src/imports/scxmlstatemachine/plugin.cpp
index 6842846..4ba3b10 100644
--- a/src/imports/scxmlstatemachine/plugin.cpp
+++ b/src/imports/scxmlstatemachine/plugin.cpp
@@ -43,7 +43,7 @@
#include "statemachineextended_p.h"
#include "invokedservices_p.h"
-#include <QQmlExtensionPlugin>
+#include <qqmlextensionplugin.h>
#include <qqml.h>
QT_BEGIN_NAMESPACE
diff --git a/src/imports/scxmlstatemachine/statemachineloader.cpp b/src/imports/scxmlstatemachine/statemachineloader.cpp
index cc908c6..247d989 100644
--- a/src/imports/scxmlstatemachine/statemachineloader.cpp
+++ b/src/imports/scxmlstatemachine/statemachineloader.cpp
@@ -40,11 +40,11 @@
#include "statemachineloader_p.h"
#include <QtScxml/qscxmlstatemachine.h>
-#include <QQmlContext>
-#include <QQmlEngine>
-#include <QQmlInfo>
-#include <QQmlFile>
-#include <QBuffer>
+#include <qqmlcontext.h>
+#include <qqmlengine.h>
+#include <qqmlinfo.h>
+#include <qqmlfile.h>
+#include <qbuffer.h>
/*!
\qmltype StateMachineLoader
diff --git a/src/imports/scxmlstatemachine/statemachineloader_p.h b/src/imports/scxmlstatemachine/statemachineloader_p.h
index 6eaf6f4..a4ee3f1 100644
--- a/src/imports/scxmlstatemachine/statemachineloader_p.h
+++ b/src/imports/scxmlstatemachine/statemachineloader_p.h
@@ -51,7 +51,7 @@
// We mean it.
//
-#include <QUrl>
+#include <QtCore/qurl.h>
#include <QtScxml/qscxmlstatemachine.h>
#include <private/qqmlengine_p.h>