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>

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>

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
 

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

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"
 

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