From 7d1579a5a2a6aaa0fb02e875288a04ba2c795e74 Mon Sep 17 00:00:00 2001
From: Edward Welbourne <edward.welbourne@qt.io>
Date: Tue, 29 Nov 2022 14:51:38 +0100
Subject: [PATCH] Impose alphabetic order on long lists of core includes

It was getting hard to keep track of what's there and where to add the
ones I need to add.

Change-Id: I849af9fae993202808b49622d3315b47aa283902
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
---
 src/qmldom/qqmldomitem.cpp           | 12 ++++++------
 tests/auto/qml/qqmlqt/tst_qqmlqt.cpp | 19 +++++++++++--------
 2 files changed, 17 insertions(+), 14 deletions(-)

diff --git a/src/qmldom/qqmldomitem.cpp b/src/qmldom/qqmldomitem.cpp
index 51a22cad81..0d6a70e69c 100644
--- a/src/qmldom/qqmldomitem.cpp
+++ b/src/qmldom/qqmldomitem.cpp
@@ -18,18 +18,18 @@
 #include <QtQml/private/qqmljsastvisitor_p.h>
 #include <QtQml/private/qqmljsast_p.h>
 
+#include <QtCore/QCborArray>
+#include <QtCore/QCborMap>
 #include <QtCore/QDebug>
 #include <QtCore/QDir>
 #include <QtCore/QFile>
 #include <QtCore/QFileInfo>
-#include <QtCore/QPair>
-#include <QtCore/QScopeGuard>
-#include <QtCore/QMutexLocker>
-#include <QtCore/QCborMap>
-#include <QtCore/QCborArray>
-#include <QtCore/QJsonValue>
 #include <QtCore/QJsonDocument>
+#include <QtCore/QJsonValue>
+#include <QtCore/QMutexLocker>
+#include <QtCore/QPair>
 #include <QtCore/QRegularExpression>
+#include <QtCore/QScopeGuard>
 #include <QtCore/QtGlobal>
 
 QT_BEGIN_NAMESPACE
diff --git a/tests/auto/qml/qqmlqt/tst_qqmlqt.cpp b/tests/auto/qml/qqmlqt/tst_qqmlqt.cpp
index 220f449dfc..6999e94943 100644
--- a/tests/auto/qml/qqmlqt/tst_qqmlqt.cpp
+++ b/tests/auto/qml/qqmlqt/tst_qqmlqt.cpp
@@ -4,22 +4,25 @@
 #include <private/qqmlengine_p.h>
 
 #include <qtest.h>
-#include <QDebug>
+
 #include <QQmlEngine>
-#include <QFontDatabase>
-#include <QFileInfo>
 #include <QQmlComponent>
+#include <QtQuick/QQuickItem>
+
+#include <QCryptographicHash>
+#include <QDebug>
 #include <QDesktopServices>
 #include <QDir>
-#include <QCryptographicHash>
-#include <QtQuick/QQuickItem>
+#include <QFileInfo>
+#include <QFont>
+#include <QFontDatabase>
+#include <QMatrix4x4>
+#include <QQuaternion>
 #include <QSignalSpy>
 #include <QVector2D>
 #include <QVector3D>
 #include <QVector4D>
-#include <QQuaternion>
-#include <QMatrix4x4>
-#include <QFont>
+
 #include <QtQuickTestUtils/private/qmlutils_p.h>
 #include <private/qglobal_p.h>