From f9b65770a1a6445f2d8e1c191ae269de936a29d7 Mon Sep 17 00:00:00 2001 From: Marc Mutz Date: Thu, 12 Dec 2024 11:32:49 +0100 Subject: [PATCH] qstringfwd.h: don't include qglobal.h qstringfwd.h is supposed to be a lean header, dragging in all of qglobal.h perverts the purpose. This also helps with certain circular-dependency issues that appeared when attempting to use this header in other low-level headers. Amends abe3b4c9b947de5e55085b37840e0d1d6f3aae42. [ChangeLog][Potentially Source-Incompatible Changes][QtCore] The qstringfwd.h header no longer includes qglobal.h. A backwards-compatible fix is to include qglobal.h yourself instead of relying on the transitive include. Pick-to: 6.5 Change-Id: I1726fccfd13b3a058abaf800c1bbf02c320143a4 Reviewed-by: Ahmad Samir (cherry picked from commit 5def8ff180c67f288bdc6e3c05b96940aeae37c0) Reviewed-by: Qt Cherry-pick Bot (cherry picked from commit e076767bfd150da155d7eb6073a5f86024ed1471) --- src/corelib/text/qstringfwd.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/corelib/text/qstringfwd.h b/src/corelib/text/qstringfwd.h index 0a0196bd59d..fe5bd4e544e 100644 --- a/src/corelib/text/qstringfwd.h +++ b/src/corelib/text/qstringfwd.h @@ -1,7 +1,8 @@ // Copyright (C) 2022 The Qt Company Ltd. // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only -#include +#include +#include #ifndef QSTRINGFWD_H #define QSTRINGFWD_H