From 47cb350d8febf7837b0a7b3cf0eca0036b75a0cb Mon Sep 17 00:00:00 2001
From: Edward Welbourne <edward.welbourne@qt.io>
Date: Wed, 23 Sep 2020 14:21:30 +0200
Subject: Standardize #include order and form in qdatetime.cpp

There were duplicates; there was neither rhyme nor reason to the order.
One was conditioned on a deprecated old define.

Change-Id: Iba390f4a83758418379fb5fc522f08ada3e41d12
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Andrei Golubev <andrei.golubev@qt.io>
---
 src/corelib/time/qdatetime.cpp | 36 ++++++++++++++++--------------------
 1 file changed, 16 insertions(+), 20 deletions(-)

diff --git a/src/corelib/time/qdatetime.cpp b/src/corelib/time/qdatetime.cpp
index ea8fc53a08..62df269785 100644
--- a/src/corelib/time/qdatetime.cpp
+++ b/src/corelib/time/qdatetime.cpp
@@ -39,39 +39,35 @@
 ****************************************************************************/
 
 #include "qplatformdefs.h"
-#include "private/qdatetime_p.h"
-#if QT_CONFIG(datetimeparser)
-#include "private/qdatetimeparser_p.h"
-#endif
+#include "qdatetime.h"
 
+#include "qcalendar.h"
 #include "qdatastream.h"
+#include "qdebug.h"
 #include "qset.h"
 #include "qlocale.h"
-#include "qdatetime.h"
-#if QT_CONFIG(timezone)
-#include "qtimezoneprivate_p.h"
+
+#include "private/qdatetime_p.h"
+#if QT_CONFIG(datetimeparser)
+#include "private/qdatetimeparser_p.h"
 #endif
-#include "qdebug.h"
-#ifndef Q_OS_WIN
-#include <locale.h>
+#ifdef Q_OS_DARWIN
+#include "private/qcore_mac_p.h"
+#endif
+#include "private/qgregoriancalendar_p.h"
+#if QT_CONFIG(timezone)
+#include "private/qtimezoneprivate_p.h"
 #endif
 
 #include <cmath>
-#ifdef Q_CC_MINGW
-#  include <unistd.h> // Define _POSIX_THREAD_SAFE_FUNCTIONS to obtain localtime_r()
-#endif
-#include <time.h>
 #ifdef Q_OS_WIN
 #  include <qt_windows.h>
 #endif
-
-#if defined(Q_OS_MAC)
-#include <private/qcore_mac_p.h>
+#include <time.h>
+#ifdef Q_CC_MINGW
+#  include <unistd.h> // Define _POSIX_THREAD_SAFE_FUNCTIONS to obtain localtime_r()
 #endif
 
-#include "qcalendar.h"
-#include "qgregoriancalendar_p.h"
-
 QT_BEGIN_NAMESPACE
 
 /*****************************************************************************
-- 
cgit v1.2.3