From 5e213a41ce487ae306135993f8e136032decf7de Mon Sep 17 00:00:00 2001 From: Konstantin Ritt Date: Wed, 18 Mar 2020 05:36:49 +0300 Subject: HB-to-Qt: stop propagating helpers and types not used outside QtGui Change-Id: I039efaeabc83bc0367bb3ab949057d2cbc6c2742 Reviewed-by: Lars Knoll --- src/gui/text/qharfbuzzng_p.h | 21 +++++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) (limited to 'src/gui/text/qharfbuzzng_p.h') diff --git a/src/gui/text/qharfbuzzng_p.h b/src/gui/text/qharfbuzzng_p.h index fabf222bae..4fb7e0aef7 100644 --- a/src/gui/text/qharfbuzzng_p.h +++ b/src/gui/text/qharfbuzzng_p.h @@ -58,24 +58,33 @@ QT_REQUIRE_CONFIG(harfbuzz); #include -#include +#if defined(QT_BUILD_GUI_LIB) +# include +#else +// a minimal set of HB types required for Qt libs other than Gui + +typedef struct hb_face_t hb_face_t; +typedef struct hb_font_t hb_font_t; + +#endif // QT_BUILD_GUI_LIB QT_BEGIN_NAMESPACE class QFontEngine; +#if defined(QT_BUILD_GUI_LIB) + // Unicode -Q_GUI_EXPORT hb_script_t hb_qt_script_to_script(QChar::Script script); -Q_GUI_EXPORT QChar::Script hb_qt_script_from_script(hb_script_t script); +hb_script_t hb_qt_script_to_script(QChar::Script script); +QChar::Script hb_qt_script_from_script(hb_script_t script); -Q_GUI_EXPORT hb_unicode_funcs_t *hb_qt_get_unicode_funcs(); +hb_unicode_funcs_t *hb_qt_get_unicode_funcs(); +#endif // QT_BUILD_GUI_LIB // Font -Q_GUI_EXPORT hb_font_funcs_t *hb_qt_get_font_funcs(); - Q_GUI_EXPORT hb_face_t *hb_qt_face_get_for_engine(QFontEngine *fe); Q_GUI_EXPORT hb_font_t *hb_qt_font_get_for_engine(QFontEngine *fe); -- cgit v1.2.3