From 8ab0d1e9e885844ecdf6e1084a31fb065472b1e9 Mon Sep 17 00:00:00 2001 From: Ivan Solovev Date: Fri, 18 Aug 2023 11:02:58 +0200 Subject: [PATCH] Do not rely on transitive includes for QESDP Explicitly include into the headers that use QESDP. This commit amends 6ff4c3d787ecc2e6d2740f22d0406b34346faede. Found during Qt 6.6 API review. Change-Id: Ia52d9e7551295f0c7380c7ed33b68f452cb689aa Reviewed-by: Marc Mutz (cherry picked from commit 314d86335ddd3ba8f67267c0e25b4df5fe0419c3) Reviewed-by: Qt Cherry-pick Bot --- src/gui/text/qfontinfo.h | 2 ++ src/gui/text/qfontmetrics.h | 2 ++ 2 files changed, 4 insertions(+) diff --git a/src/gui/text/qfontinfo.h b/src/gui/text/qfontinfo.h index c162003801f..0edee5abe52 100644 --- a/src/gui/text/qfontinfo.h +++ b/src/gui/text/qfontinfo.h @@ -7,6 +7,8 @@ #include #include +#include + QT_BEGIN_NAMESPACE diff --git a/src/gui/text/qfontmetrics.h b/src/gui/text/qfontmetrics.h index 8f16ccb5a73..1942d1fa839 100644 --- a/src/gui/text/qfontmetrics.h +++ b/src/gui/text/qfontmetrics.h @@ -6,9 +6,11 @@ #include #include + #ifndef QT_INCLUDE_COMPAT #include #endif +#include QT_BEGIN_NAMESPACE