diff options
Diffstat (limited to 'src/gui')
-rw-r--r-- | src/gui/text/qfontengine_ft.cpp | 1 | ||||
-rw-r--r-- | src/gui/text/qfontengine_ft_p.h | 6 | ||||
-rw-r--r-- | src/gui/text/qharfbuzz_copy_p.h | 5 | ||||
-rw-r--r-- | src/gui/text/qtextengine_p.h | 6 |
4 files changed, 7 insertions, 11 deletions
diff --git a/src/gui/text/qfontengine_ft.cpp b/src/gui/text/qfontengine_ft.cpp index 9a5d9d6f2e..dd30a15030 100644 --- a/src/gui/text/qfontengine_ft.cpp +++ b/src/gui/text/qfontengine_ft.cpp @@ -51,7 +51,6 @@ #include "qabstractfileengine.h" #include "qthreadstorage.h" #include <qmath.h> -#include <private/qharfbuzz_p.h> #include "qfontengine_ft_p.h" #include <ft2build.h> diff --git a/src/gui/text/qfontengine_ft_p.h b/src/gui/text/qfontengine_ft_p.h index 4ee26582b4..bd8e24a3fe 100644 --- a/src/gui/text/qfontengine_ft_p.h +++ b/src/gui/text/qfontengine_ft_p.h @@ -70,11 +70,7 @@ #include <qmutex.h> -#if defined (QT_BUILD_GUI_LIB) -# include "private/qharfbuzz_p.h" -#else -# include "private/qharfbuzz_copy_p.h" -#endif +#include "private/qharfbuzz_copy_p.h" QT_BEGIN_NAMESPACE diff --git a/src/gui/text/qharfbuzz_copy_p.h b/src/gui/text/qharfbuzz_copy_p.h index 07503240a2..74b824ab35 100644 --- a/src/gui/text/qharfbuzz_copy_p.h +++ b/src/gui/text/qharfbuzz_copy_p.h @@ -34,6 +34,9 @@ headers for font and text classes without having to pull in the full harfbuzz library under QTDIR/src/3rdparty/harfbuzz/src */ +#if defined(QT_BUILD_GUI_LIB) || defined(QT_COMPILES_IN_HARFBUZZ) +#include <private/qharfbuzz_p.h> +#else extern "C" { @@ -98,4 +101,6 @@ typedef struct { } +#endif // ifdef QT_BUILD_GUI_LIB + #endif // QHARFBUZZ_COPY_P_H diff --git a/src/gui/text/qtextengine_p.h b/src/gui/text/qtextengine_p.h index 44e38e7343..f4752288c2 100644 --- a/src/gui/text/qtextengine_p.h +++ b/src/gui/text/qtextengine_p.h @@ -71,11 +71,7 @@ #include "private/qtextdocument_p.h" #endif -#if defined (QT_BUILD_GUI_LIB) -# include "private/qharfbuzz_p.h" -#else -# include "private/qharfbuzz_copy_p.h" -#endif +#include "private/qharfbuzz_copy_p.h" #include "private/qfixed_p.h" |