Misc: Do not depend on transitive includes

As a drive-by, remove superfluous includes from qnetworkmanagerservice.h
and obey the coding conventions for includes in a few more places.

Change-Id: I65b68c0cef7598d06a125e97637040392d4be9ff
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>

15 files changed, 24 insertions, 3 deletions

diff --git a/src/plugins/networkinformation/networkmanager/qnetworkmanagerservice.h b/src/plugins/networkinformation/networkmanager/qnetworkmanagerservice.h
index f13ec88ad5..1238b1e287 100644
--- a/src/plugins/networkinformation/networkmanager/qnetworkmanagerservice.h
+++ b/src/plugins/networkinformation/networkmanager/qnetworkmanagerservice.h
@@ -51,9 +51,9 @@
 // We mean it.
 //
 
-#include <QtDBus/QDBusAbstractInterface>
-#include <QtDBus/QDBusPendingCallWatcher>
-#include <QtDBus/QDBusObjectPath>
+#include <QtCore/qvariant.h>
+#include <QtCore/qmap.h>
+#include <QtDBus/qdbusabstractinterface.h>
 
 #include <optional>
 
@@ -74,6 +74,8 @@ enum NMDeviceState {
 
 QT_BEGIN_NAMESPACE
 
+class QDBusObjectPath;
+
 // This tiny class exists for the purpose of seeing if NetworkManager is available without
 // initializing everything the derived/full class needs.
 class QNetworkManagerInterfaceBase : public QDBusAbstractInterface
diff --git a/src/plugins/platforminputcontexts/compose/qcomposeplatforminputcontext.cpp b/src/plugins/platforminputcontexts/compose/qcomposeplatforminputcontext.cpp
index da5235e491..df2be7afe9 100644
--- a/src/plugins/platforminputcontexts/compose/qcomposeplatforminputcontext.cpp
+++ b/src/plugins/platforminputcontexts/compose/qcomposeplatforminputcontext.cpp
@@ -39,6 +39,7 @@
 #include "qcomposeplatforminputcontext.h"
 
 #include <QtCore/QCoreApplication>
+#include <QtCore/qvarlengtharray.h>
 #include <QtGui/QKeyEvent>
 #include <QtGui/QGuiApplication>
 
diff --git a/src/plugins/platforms/android/androidjniaccessibility.cpp b/src/plugins/platforms/android/androidjniaccessibility.cpp
index 807db78ecf..47937d574f 100644
--- a/src/plugins/platforms/android/androidjniaccessibility.cpp
+++ b/src/plugins/platforms/android/androidjniaccessibility.cpp
@@ -51,6 +51,7 @@
 #include <QtCore/QJniObject>
 #include <QtGui/private/qhighdpiscaling_p.h>
 #include <QtCore/QObject>
+#include <QtCore/qvarlengtharray.h>
 
 static const char m_qtTag[] = "Qt A11Y";
 static const char m_classErrorMsg[] = "Can't find class \"%s\"";
diff --git a/src/plugins/platforms/android/qandroidplatformtheme.h b/src/plugins/platforms/android/qandroidplatformtheme.h
index b49d2516f1..087ad95103 100644
--- a/src/plugins/platforms/android/qandroidplatformtheme.h
+++ b/src/plugins/platforms/android/qandroidplatformtheme.h
@@ -43,6 +43,8 @@
 #include <qpa/qplatformtheme.h>
 #include <QtGui/qfont.h>
 #include <QtGui/qpalette.h>
+#include <QtCore/qhash.h>
+#include <QtCore/qbytearray.h>
 
 #include <QJsonObject>
 
diff --git a/src/plugins/platforms/cocoa/qcocoaaccessibility.mm b/src/plugins/platforms/cocoa/qcocoaaccessibility.mm
index 0f5c638f7c..1ec4c5a114 100644
--- a/src/plugins/platforms/cocoa/qcocoaaccessibility.mm
+++ b/src/plugins/platforms/cocoa/qcocoaaccessibility.mm
@@ -42,6 +42,7 @@
 #include "qcocoaaccessibility.h"
 #include "qcocoaaccessibilityelement.h"
 #include <QtGui/qaccessible.h>
+#include <QtCore/qmap.h>
 #include <private/qcore_mac_p.h>
 
 QT_BEGIN_NAMESPACE
diff --git a/src/plugins/platforms/cocoa/qcocoaglcontext.h b/src/plugins/platforms/cocoa/qcocoaglcontext.h
index 633b9256c8..9d268a0d4a 100644
--- a/src/plugins/platforms/cocoa/qcocoaglcontext.h
+++ b/src/plugins/platforms/cocoa/qcocoaglcontext.h
@@ -41,6 +41,7 @@
 #define QCOCOAGLCONTEXT_H
 
 #include <QtCore/QPointer>
+#include <QtCore/QVarLengthArray>
 #include <QtCore/private/qcore_mac_p.h>
 #include <qpa/qplatformopenglcontext.h>
 #include <QtGui/qopenglcontext.h>
diff --git a/src/plugins/platforms/ios/qiosclipboard.h b/src/plugins/platforms/ios/qiosclipboard.h
index 3fe9b29b71..e14e83e96e 100644
--- a/src/plugins/platforms/ios/qiosclipboard.h
+++ b/src/plugins/platforms/ios/qiosclipboard.h
@@ -40,6 +40,7 @@
 #ifndef QIOSCLIPBOARD_H
 #define QIOSCLIPBOARD_H
 
+#include <QtCore/qmap.h>
 #include <qpa/qplatformclipboard.h>
 
 #ifndef QT_NO_CLIPBOARD
diff --git a/src/plugins/platforms/qnx/qqnxbuttoneventnotifier.cpp b/src/plugins/platforms/qnx/qqnxbuttoneventnotifier.cpp
index f0c4c385ef..f1e7a545f1 100644
--- a/src/plugins/platforms/qnx/qqnxbuttoneventnotifier.cpp
+++ b/src/plugins/platforms/qnx/qqnxbuttoneventnotifier.cpp
@@ -42,6 +42,8 @@
 #include <QtGui/QGuiApplication>
 #include <qpa/qwindowsysteminterface.h>
 
+#include <QtCore/qhash.h>
+#include <QtCore/qbytearray.h>
 #include <QtCore/QDebug>
 #include <QtCore/QMetaEnum>
 #include <QtCore/QSocketNotifier>
diff --git a/src/plugins/platforms/qnx/qqnxnavigatorpps.cpp b/src/plugins/platforms/qnx/qqnxnavigatorpps.cpp
index d5234ca92f..90b244cf55 100644
--- a/src/plugins/platforms/qnx/qqnxnavigatorpps.cpp
+++ b/src/plugins/platforms/qnx/qqnxnavigatorpps.cpp
@@ -40,6 +40,8 @@
 #include "qqnxnavigatorpps.h"
 
 #include <QDebug>
+#include <QHash>
+#include <QByteArray>
 #include <private/qcore_unix_p.h>
 
 #if defined(QQNXNAVIGATOR_DEBUG)
diff --git a/src/plugins/platforms/vkkhrdisplay/qvkkhrdisplayvulkaninstance.cpp b/src/plugins/platforms/vkkhrdisplay/qvkkhrdisplayvulkaninstance.cpp
index c670638b0d..9a7ef65dfc 100644
--- a/src/plugins/platforms/vkkhrdisplay/qvkkhrdisplayvulkaninstance.cpp
+++ b/src/plugins/platforms/vkkhrdisplay/qvkkhrdisplayvulkaninstance.cpp
@@ -38,6 +38,7 @@
 ****************************************************************************/
 
 #include "qvkkhrdisplayvulkaninstance.h"
+#include <QVarLengthArray>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/plugins/platforms/windows/qwindowsopengltester.cpp b/src/plugins/platforms/windows/qwindowsopengltester.cpp
index e8d10e3555..1c2b357cae 100644
--- a/src/plugins/platforms/windows/qwindowsopengltester.cpp
+++ b/src/plugins/platforms/windows/qwindowsopengltester.cpp
@@ -41,6 +41,7 @@
 #include "qwindowscontext.h"
 
 #include <QtCore/qvariant.h>
+#include <QtCore/qmap.h>
 #include <QtCore/qdebug.h>
 #include <QtCore/qtextstream.h>
 #include <QtCore/qcoreapplication.h>
diff --git a/src/plugins/platforms/windows/qwindowstheme.h b/src/plugins/platforms/windows/qwindowstheme.h
index 9d5fcc92fe..710d1dc686 100644
--- a/src/plugins/platforms/windows/qwindowstheme.h
+++ b/src/plugins/platforms/windows/qwindowstheme.h
@@ -44,6 +44,8 @@
 
 #include <QtCore/qsharedpointer.h>
 #include <QtCore/qvariant.h>
+#include <QtCore/qlist.h>
+#include <QtCore/qsize.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/plugins/tls/openssl/qsslsocket_openssl_android.cpp b/src/plugins/tls/openssl/qsslsocket_openssl_android.cpp
index 1c11377c0e..e1cda20aea 100644
--- a/src/plugins/tls/openssl/qsslsocket_openssl_android.cpp
+++ b/src/plugins/tls/openssl/qsslsocket_openssl_android.cpp
@@ -54,6 +54,8 @@
 
 #include <QtCore/QJniEnvironment>
 #include <QtCore/QJniObject>
+#include <QtCore/QList>
+#include <QtCore/QByteArray>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/plugins/tls/openssl/qtlsbackend_openssl.cpp b/src/plugins/tls/openssl/qtlsbackend_openssl.cpp
index 9acac9b9d1..6a25163162 100644
--- a/src/plugins/tls/openssl/qtlsbackend_openssl.cpp
+++ b/src/plugins/tls/openssl/qtlsbackend_openssl.cpp
@@ -57,6 +57,7 @@
 #include <QtCore/qlist.h>
 #include <QtCore/qmutex.h>
 #include <QtCore/qscopeguard.h>
+#include <QtCore/qset.h>
 
 #include "qopenssl_p.h"
 
diff --git a/src/plugins/tls/schannel/qtlskey_schannel.cpp b/src/plugins/tls/schannel/qtlskey_schannel.cpp
index 5004cd9c55..586b9c3eae 100644
--- a/src/plugins/tls/schannel/qtlskey_schannel.cpp
+++ b/src/plugins/tls/schannel/qtlskey_schannel.cpp
@@ -51,6 +51,7 @@
 
 #include <QtCore/qscopeguard.h>
 #include <QtCore/qbytearray.h>
+#include <QtCore/qvarlengtharray.h>
 
 QT_BEGIN_NAMESPACE