diff options
author | Edward Welbourne <edward.welbourne@qt.io> | 2021-09-10 16:46:38 +0200 |
---|---|---|
committer | Edward Welbourne <edward.welbourne@qt.io> | 2021-09-14 13:07:34 +0200 |
commit | 8e8a55e6602f595c084a5849c2deeb8fdc3eafb7 (patch) | |
tree | 84d0573a60229eb1d4f8d527b357401ba418c34e /tests | |
parent | 458d53f5723314b946d0b401bf91e417131263e9 (diff) |
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>
Diffstat (limited to 'tests')
-rw-r--r-- | tests/auto/corelib/text/qlocale/tst_qlocale.cpp | 32 |
1 files 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 d68af22585..1c271ffefb 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 <QScopedArrayPointer> -#include <QTimeZone> -#include <qdatetime.h> +#include <QLocale> + +#include <QDateTime> +#include <QDebug> +#include <QDir> +#include <QFileInfo> +#include <qnumeric.h> #if QT_CONFIG(process) -# include <qprocess.h> +# include <QProcess> #endif -#include <float.h> +#include <QScopedArrayPointer> +#include <QTimeZone> -#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) |