diff options
| author | Tapani Mikola <tapani.mikola@nokia.com> | 2011-06-10 09:25:54 +0300 |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-06-10 09:40:55 +0200 |
| commit | db37aa1004f1e2489b94f1d9cc21630b62e03552 (patch) | |
| tree | 83fa655c0c306d267e9e7e4f97792b048780a855 | |
| parent | afd5d43b0ca77f1cf27bc4e0a05bce6570edb0c9 (diff) | |
Fontengine buildfix for xcb platform plugin.
Change-Id: Ic909e1ac08163e62634643c68862e802a016b911
Reviewed-on: http://codereview.qt.nokia.com/442
Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
| -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 | ||||
| -rw-r--r-- | src/plugins/platforms/fontdatabases/basicunix/basicunix.pri | 2 |
5 files changed, 9 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" diff --git a/src/plugins/platforms/fontdatabases/basicunix/basicunix.pri b/src/plugins/platforms/fontdatabases/basicunix/basicunix.pri index da4698df0d..c1fbf3e411 100644 --- a/src/plugins/platforms/fontdatabases/basicunix/basicunix.pri +++ b/src/plugins/platforms/fontdatabases/basicunix/basicunix.pri @@ -7,6 +7,8 @@ SOURCES += \ $$QT_SOURCE_TREE/src/plugins/platforms/fontdatabases/basicunix/qbasicunixfontdatabase.cpp \ $$QT_SOURCE_TREE/src/gui/text/qfontengine_ft.cpp +DEFINES += QT_COMPILES_IN_HARFBUZZ + INCLUDEPATH += $$QT_SOURCE_TREE/src/3rdparty/harfbuzz/src INCLUDEPATH += $$QT_SOURCE_TREE/src/plugins/platforms/fontdatabases/basicunix |