XmlListModel: Clean up includes

Include only what we need, and normalize the include forms.

Change-Id: I77013b8abf5132ca40aa5979619b5a37c472ac46
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Semih Yavuz <semih.yavuz@qt.io>
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>

src/qmlxmllistmodel/qqmlxmllistmodel.cpp

@@ -3,9 +3,21 @@
 
 #include "qqmlxmllistmodel_p.h"
 
-#include <QQmlFile>
-#include <QFile>
-#include <QCoreApplication>
+#include <QtQml/qqmlcontext.h>
+#include <QtQml/qqmlengine.h>
+#include <QtQml/qqmlinfo.h>
+#include <QtQml/qqmlfile.h>
+
+#include <QtCore/qcoreapplication.h>
+#include <QtCore/qfile.h>
+#include <QtCore/qfuturewatcher.h>
+#include <QtCore/qtimer.h>
+#include <QtCore/qxmlstream.h>
+
+#if QT_CONFIG(qml_network)
+#include <QtNetwork/qnetworkreply.h>
+#include <QtNetwork/qnetworkrequest.h>
+#endif
 
 Q_DECLARE_METATYPE(QQmlXmlListModelQueryResult)
 

src/qmlxmllistmodel/qqmlxmllistmodel_p.h

@@ -15,24 +15,28 @@
 // We mean it.
 //
 
-#include <QtQml>
-#include <QAbstractItemModel>
-#include <QByteArray>
-#include <QtCore/private/qflatmap_p.h>
-#include <QHash>
-#include <QStringList>
-#include <QUrl>
-#include <QFuture>
-#if QT_CONFIG(qml_network)
-#include <QNetworkRequest>
-#include <QNetworkReply>
-#include <QXmlStreamReader>
-#endif
+#include <private/qflatmap_p.h>
+#include <private/qtqmlxmllistmodelglobal_p.h>
 
-#include "qtqmlxmllistmodelglobal_p.h"
+#include <QtQml/qqmllist.h>
+#include <QtQml/qqmlparserstatus.h>
+
+#include <QtQmlIntegration/qqmlintegration.h>
+
+#include <QtCore/qabstractitemmodel.h>
+#include <QtCore/qbytearray.h>
+#include <QtCore/qfuture.h>
+#include <QtCore/qhash.h>
+#include <QtCore/qstringlist.h>
+#include <QtCore/qurl.h>
 
 QT_BEGIN_NAMESPACE
 
+#if QT_CONFIG(qml_network)
+class QNetworkReply;
+#endif
+
+class QXmlStreamReader;
 class QQmlContext;
 struct QQmlXmlListModelQueryJob
 {

tests/auto/qml/qqmlxmllistmodel/tst_qqmlxmllistmodel.cpp

@@ -1,18 +1,20 @@
 // Copyright (C) 2021 The Qt Company Ltd.
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
 
-#include <QtTest/QtTest>
-#include <QSignalSpy>
-#include <QMetaObject>
-#include <QSortFilterProxyModel>
-#include <QFile>
-#include <QTimer>
-#include <QTemporaryFile>
-#include <QNetworkRequest>
-#include <QNetworkAccessManager>
 #include <QtQmlXmlListModel/private/qqmlxmllistmodel_p.h>
 #include <QtQuickTestUtils/private/qmlutils_p.h>
 
+#include <QtTest/qsignalspy.h>
+
+#include <QtQml/qqmlcomponent.h>
+#include <QtQml/qqmlengine.h>
+#include <QtQml/qqmlnetworkaccessmanagerfactory.h>
+
+#include <QtCore/qset.h>
+#include <QtCore/qsortfilterproxymodel.h>
+#include <QtCore/qtemporaryfile.h>
+#include <QtCore/qtimer.h>
+
 using namespace Qt::StringLiterals;
 
 typedef QList<QVariantList> QQmlXmlModelData;