From d56e5ea8ad6096a5e7f5a20a8d572a721d89bf0d Mon Sep 17 00:00:00 2001
From: Robert Brock <robert.brock@kdab.com>
Date: Wed, 11 Jan 2017 10:16:52 +0000
Subject: Fixes includes to comply with coding conventions for Src/Core

Reordering the header includes to comply with Qt coding conventions

Task-number: QTBUG-56185
Change-Id: I3943678c183c4ef46d403e0fff878c3cad964dfa
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
---
 src/core/services/qsysteminformationservice_p.h | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'src/core/services/qsysteminformationservice_p.h')

diff --git a/src/core/services/qsysteminformationservice_p.h b/src/core/services/qsysteminformationservice_p.h
index dc384fb93..0ab737817 100644
--- a/src/core/services/qsysteminformationservice_p.h
+++ b/src/core/services/qsysteminformationservice_p.h
@@ -52,9 +52,10 @@
 //
 
 #include <Qt3DCore/qt3dcore_global.h>
-#include <Qt3DCore/private/qservicelocator_p.h>
 #include <QtCore/qstringlist.h>
 
+#include <Qt3DCore/private/qservicelocator_p.h>
+
 QT_BEGIN_NAMESPACE
 
 namespace Qt3DCore {
-- 
cgit v1.2.3


From 54b097b495ca483123bf38966232428267428944 Mon Sep 17 00:00:00 2001
From: Mike Krus <mike.krus@kdab.com>
Date: Mon, 1 May 2017 13:38:43 +0100
Subject: Add missing Q_OBJECT (clazy reports)

Change-Id: I0bc49e1b391c610a8f8f649a45391b31f9283302
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
---
 src/core/services/qsysteminformationservice_p.h | 1 +
 1 file changed, 1 insertion(+)

(limited to 'src/core/services/qsysteminformationservice_p.h')

diff --git a/src/core/services/qsysteminformationservice_p.h b/src/core/services/qsysteminformationservice_p.h
index 0ab737817..01e976b77 100644
--- a/src/core/services/qsysteminformationservice_p.h
+++ b/src/core/services/qsysteminformationservice_p.h
@@ -64,6 +64,7 @@ class QSystemInformationServicePrivate;
 
 class QT3DCORESHARED_EXPORT QSystemInformationService : public QAbstractServiceProvider
 {
+    Q_OBJECT
 public:
     virtual QStringList aspectNames() const = 0;
     virtual int threadPoolThreadCount() const = 0;
-- 
cgit v1.2.3