summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIvan Solovev <ivan.solovev@qt.io>2023-08-18 11:02:58 +0200
committerMarc Mutz <marc.mutz@qt.io>2023-08-18 16:00:10 +0000
commit314d86335ddd3ba8f67267c0e25b4df5fe0419c3 (patch)
tree15c7a02c2d81bf01e80a8d35943e51039c000259
parent470b2b8ad9f28eaf24518dfa3f48cc13fcdc421f (diff)
Do not rely on transitive includes for QESDP
Explicitly include <QtCore/qshareddata.h> into the headers that use QESDP. This commit amends 6ff4c3d787ecc2e6d2740f22d0406b34346faede. Found during Qt 6.6 API review. Pick-to: 6.6 Change-Id: Ia52d9e7551295f0c7380c7ed33b68f452cb689aa Reviewed-by: Marc Mutz <marc.mutz@qt.io>
-rw-r--r--src/gui/text/qfontinfo.h2
-rw-r--r--src/gui/text/qfontmetrics.h2
2 files changed, 4 insertions, 0 deletions
diff --git a/src/gui/text/qfontinfo.h b/src/gui/text/qfontinfo.h
index c162003801..0edee5abe5 100644
--- a/src/gui/text/qfontinfo.h
+++ b/src/gui/text/qfontinfo.h
@@ -7,6 +7,8 @@
#include <QtGui/qtguiglobal.h>
#include <QtGui/qfont.h>
+#include <QtCore/qshareddata.h>
+
QT_BEGIN_NAMESPACE
diff --git a/src/gui/text/qfontmetrics.h b/src/gui/text/qfontmetrics.h
index 8f16ccb5a7..1942d1fa83 100644
--- a/src/gui/text/qfontmetrics.h
+++ b/src/gui/text/qfontmetrics.h
@@ -6,9 +6,11 @@
#include <QtGui/qtguiglobal.h>
#include <QtGui/qfont.h>
+
#ifndef QT_INCLUDE_COMPAT
#include <QtCore/qrect.h>
#endif
+#include <QtCore/qshareddata.h>
QT_BEGIN_NAMESPACE