From 8e8a55e6602f595c084a5849c2deeb8fdc3eafb7 Mon Sep 17 00:00:00 2001
From: Edward Welbourne <edward.welbourne@qt.io>
Date: Fri, 10 Sep 2021 16:46:38 +0200
Subject: [PATCH] Tidy up #includes in tst_qlocale.cpp

System headers were jumbled in with Qt headers. Separate those out and
use standard names for Qt headers. Tidied some #if-ery.

Change-Id: Ic8c61797303567eeaef48e2560e91924ddb380f0
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
---
 .../auto/corelib/text/qlocale/tst_qlocale.cpp | 32 +++++++++----------
 1 file changed, 15 insertions(+), 17 deletions(-)

diff --git a/tests/auto/corelib/text/qlocale/tst_qlocale.cpp b/tests/auto/corelib/text/qlocale/tst_qlocale.cpp
index d68af22585e..1c271ffefba 100644
--- a/tests/auto/corelib/text/qlocale/tst_qlocale.cpp
+++ b/tests/auto/corelib/text/qlocale/tst_qlocale.cpp
@@ -26,32 +26,30 @@
 **
 ****************************************************************************/
 
-
 #include <QTest>
-#include <math.h>
-#include <qdebug.h>
-#include <qdir.h>
-#include <qfileinfo.h>
+#include <QLocale>
+
+#include <QDateTime>
+#include <QDebug>
+#include <QDir>
+#include <QFileInfo>
+#include <qnumeric.h>
+#if QT_CONFIG(process)
+#  include <QProcess>
+#endif
 #include <QScopedArrayPointer>
 #include <QTimeZone>
-#include <qdatetime.h>
-#if QT_CONFIG(process)
-# include <qprocess.h>
-#endif
-#include <float.h>
 
-#include <qlocale.h>
 #include <private/qlocale_p.h>
 #include <private/qlocale_tools_p.h>
-#include <qnumeric.h>
 #include "../../../../shared/localechange.h"
 
-#if defined(Q_OS_LINUX) && !defined(__UCLIBC__)
-#    define QT_USE_FENV
-#endif
+#include <float.h>
+#include <math.h>
 
-#ifdef QT_USE_FENV
-#    include <fenv.h>
+#if defined(Q_OS_LINUX) && !defined(__UCLIBC__)
+#  include <fenv.h>
+#  define QT_USE_FENV
 #endif
 
 #if defined(Q_OS_UNIX) && !defined(Q_OS_MAC)