From b02798095d66bb9c2d81652b2c4f287b128b24ee Mon Sep 17 00:00:00 2001 From: Marc Mutz Date: Mon, 29 Apr 2024 09:59:59 +0200 Subject: [PATCH] QtCore/removed_api: fix 6.8 block order, global include MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit There must be no include other than qglobal.h¹ outside QT_CORE_REMOVED_SINCE blocks, otherwise REMOVED_SINCE in that header might not work correctly. Move the include to the block in which it's used. ¹ and we should eventually reduce that to the bare minimum, too. This include is still from the time when there was only the monolithic qglobal.h. Amends bfc7535a10f7a6e3723f354b41f08a0fe1d18719. Also move the qstring.h block which was not in alphabetical order. Amends 42b6fdfb523f47ba711138bb299d97823e7c64d2. Change-Id: I997ebf0028e31ef86145d2d0c7455e7c54bbf7e9 Reviewed-by: Ivan Solovev Reviewed-by: Ahmad Samir --- src/corelib/compat/removed_api.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/corelib/compat/removed_api.cpp b/src/corelib/compat/removed_api.cpp index 7d3d3b5bd6..23679bf4cc 100644 --- a/src/corelib/compat/removed_api.cpp +++ b/src/corelib/compat/removed_api.cpp @@ -4,7 +4,6 @@ #define QT_CORE_BUILD_REMOVED_API #include "qglobal.h" -#include "qnumeric.h" QT_USE_NAMESPACE @@ -1014,6 +1013,7 @@ bool QMimeType::operator==(const QMimeType &other) const } #include "qobject.h" +#include "qnumeric.h" int QObject::startTimer(std::chrono::milliseconds time, Qt::TimerType timerType) { @@ -1071,6 +1071,8 @@ qsizetype QRegularExpressionMatch::capturedEnd(QStringView name) const } #endif // QT_CONFIG(regularexpression) +#include "qstring.h" // inlined API + #include "qurl.h" bool QUrl::operator<(const QUrl &url) const @@ -1095,8 +1097,6 @@ bool QUrlQuery::operator==(const QUrlQuery &other) const return comparesEqual(*this, other); } -#include "qstring.h" // inlined API - #include "qxmlstream.h" // inlined API // #include "qotherheader.h"