Fix and shuffle some includes

Task-number: QTIFW-1829
Change-Id: I16025ae23f91849d6317e25e56099c77a37f0cd9
Reviewed-by: Arttu Tarkiainen <arttu.tarkiainen@qt.io>

8 files changed, 16 insertions, 6 deletions

diff --git a/src/libs/installer/abstracttask.h b/src/libs/installer/abstracttask.h
index 7daff848f..5ee23bef5 100644
--- a/src/libs/installer/abstracttask.h
+++ b/src/libs/installer/abstracttask.h
@@ -31,7 +31,9 @@
 
 #include "runextensions.h"
 
+#include <QException>
 #include <QFutureInterface>
+#include <QVariant>
 
 namespace QInstaller {
 
diff --git a/src/libs/installer/component.h b/src/libs/installer/component.h
index bb1a7d1b6..8092b4c37 100644
--- a/src/libs/installer/component.h
+++ b/src/libs/installer/component.h
@@ -32,7 +32,6 @@
 #include "constants.h"
 #include "component_p.h"
 #include "qinstallerglobal.h"
-#include "packagemanagercore.h"
 
 #include <QtCore/QDir>
 #include <QtCore/QMetaType>
@@ -44,6 +43,8 @@ QT_FORWARD_DECLARE_CLASS(QQmlV4Function)
 
 namespace QInstaller {
 
+class PackageManagerCore;
+
 class INSTALLER_EXPORT Component : public QObject, public ComponentModelHelper
 {
     Q_OBJECT
diff --git a/src/libs/installer/componentmodel.h b/src/libs/installer/componentmodel.h
index b6b489888..1e8a2d297 100644
--- a/src/libs/installer/componentmodel.h
+++ b/src/libs/installer/componentmodel.h
@@ -31,6 +31,8 @@
 
 #include "qinstallerglobal.h"
 
+#include "component.h"
+
 #include <QtCore/QAbstractItemModel>
 #include <QtCore/QList>
 #include <QtCore/QSet>
@@ -38,7 +40,6 @@
 
 namespace QInstaller {
 
-class Component;
 class PackageManagerCore;
 
 class INSTALLER_EXPORT ComponentModel : public QAbstractItemModel
diff --git a/src/libs/installer/lib7z_create.h b/src/libs/installer/lib7z_create.h
index 9e920aa55..b908b028f 100644
--- a/src/libs/installer/lib7z_create.h
+++ b/src/libs/installer/lib7z_create.h
@@ -35,9 +35,10 @@
 #include <Common/MyCom.h>
 #include <7zip/UI/Common/Update.h>
 
+#include <QStringList>
+
 QT_BEGIN_NAMESPACE
 class QFileDevice;
-class QStringList;
 QT_END_NAMESPACE
 
 namespace Lib7z
diff --git a/src/libs/installer/loggingutils.cpp b/src/libs/installer/loggingutils.cpp
index f1c638bbf..42bbc0117 100644
--- a/src/libs/installer/loggingutils.cpp
+++ b/src/libs/installer/loggingutils.cpp
@@ -31,6 +31,7 @@
 #include "component.h"
 #include "globals.h"
 #include "fileutils.h"
+#include "packagemanagercore.h"
 #include "remoteclient.h"
 #include "remotefileengine.h"
 
diff --git a/src/libs/installer/packagemanagercore.h b/src/libs/installer/packagemanagercore.h
index 8a0b09c02..936a377ab 100644
--- a/src/libs/installer/packagemanagercore.h
+++ b/src/libs/installer/packagemanagercore.h
@@ -29,6 +29,7 @@
 #define PACKAGEMANAGERCORE_H
 
 #include "binaryformat.h"
+#include "component.h"
 #include "protocol.h"
 #include "repository.h"
 #include "qinstallerglobal.h"
@@ -38,12 +39,12 @@
 #include <QtCore/QHash>
 #include <QtCore/QObject>
 #include <QtCore/QStringList>
-#include <QtCore/QVector>
+#include <QtCore/QList>
 #include <QSettings>
+#include <QModelIndex>
 
 namespace QInstaller {
 
-class Component;
 class ComponentModel;
 class ScriptEngine;
 class PackageManagerCorePrivate;
diff --git a/src/libs/installer/qprocesswrapper.cpp b/src/libs/installer/qprocesswrapper.cpp
index f4c481af2..6f34e36da 100644
--- a/src/libs/installer/qprocesswrapper.cpp
+++ b/src/libs/installer/qprocesswrapper.cpp
@@ -32,6 +32,7 @@
 #include "utils.h"
 
 #include <QDir>
+#include <QVariant>
 
 namespace QInstaller {
 
diff --git a/src/libs/installer/remoteobject.h b/src/libs/installer/remoteobject.h
index 4dce2a218..c423de943 100644
--- a/src/libs/installer/remoteobject.h
+++ b/src/libs/installer/remoteobject.h
@@ -35,8 +35,10 @@
 
 #include <QCoreApplication>
 #include <QDataStream>
-#include <QObject>
 #include <QLocalSocket>
+#include <QObject>
+#include <QVariant>
+
 
 namespace QInstaller {