From aecafffe56e53b8961eec9439c3a84a06a9ae19d Mon Sep 17 00:00:00 2001 From: Thiago Macieira Date: Tue, 14 Jan 2025 15:42:46 -0800 Subject: [PATCH] qlogging.cpp: sort the headers and move qt_windows.h to the bottom Standard practice. Change-Id: If8d08785be6073236e92fffd0acea703f5a7f49d Reviewed-by: Ahmad Samir --- src/corelib/global/qlogging.cpp | 36 ++++++++++++++++----------------- 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/src/corelib/global/qlogging.cpp b/src/corelib/global/qlogging.cpp index d224fbe6f68..b046ee34e8e 100644 --- a/src/corelib/global/qlogging.cpp +++ b/src/corelib/global/qlogging.cpp @@ -3,30 +3,26 @@ // Copyright (C) 2022 Intel Corporation. // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only -#include "qglobal_p.h" #include "qlogging.h" #include "qlogging_p.h" -#include "qlist.h" + #include "qbytearray.h" +#include "qlist.h" +#include "qcoreapplication.h" +#include "private/qcoreapplication_p.h" +#include "qdatetime.h" +#include "qdebug.h" +#include "qgettid_p.h" +#include "private/qlocking_p.h" +#include "qloggingcategory.h" +#include "private/qloggingregistry_p.h" +#include "qmutex.h" #include "qscopeguard.h" #include "qstring.h" -#include "qvarlengtharray.h" -#include "qdebug.h" -#include "qmutex.h" -#include -#include "qloggingcategory.h" -#ifndef QT_BOOTSTRAPPED -#include "qdatetime.h" -#include "qcoreapplication.h" +#include "qtcore_tracepoints_p.h" #include "qthread.h" -#include "private/qloggingregistry_p.h" -#include "private/qcoreapplication_p.h" -#include "qgettid_p.h" -#include -#endif -#ifdef Q_OS_WIN -#include -#endif +#include "qvarlengtharray.h" + #ifdef Q_CC_MSVC #include #endif @@ -88,6 +84,10 @@ extern char *__progname; #include +#ifdef Q_OS_WIN +#include +#endif + QT_BEGIN_NAMESPACE using namespace Qt::StringLiterals;