From de155ecd2b16d9356a19baeb875539a20b36a17c Mon Sep 17 00:00:00 2001
From: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Date: Thu, 20 Jan 2011 18:26:43 +0100
Subject: Revert "don't include harfbuzz where we don't use it"

harfbuzz is indirectly included via qharfbuzz_p.h, which is included by
qtextengine_p.h, which in turn is included by qfontengine_p.h and
qpaintbuffer_p.h.

This reverts commit 6551a2933126cc86ac4c1e5265e967100d240fb0.
---
 src/declarative/declarative.pro             | 2 ++
 src/opengl/opengl.pro                       | 2 ++
 src/openvg/openvg.pro                       | 2 ++
 src/plugins/graphicssystems/trace/trace.pro | 1 +
 src/svg/svg.pro                             | 2 ++
 5 files changed, 9 insertions(+)

diff --git a/src/declarative/declarative.pro b/src/declarative/declarative.pro
index d2c035c..1ad888b 100644
--- a/src/declarative/declarative.pro
+++ b/src/declarative/declarative.pro
@@ -30,3 +30,5 @@ symbian: {
 }
 
 DEFINES += QT_NO_OPENTYPE
+INCLUDEPATH += ../3rdparty/harfbuzz/src
+
diff --git a/src/opengl/opengl.pro b/src/opengl/opengl.pro
index 45cb750..0e82467 100644
--- a/src/opengl/opengl.pro
+++ b/src/opengl/opengl.pro
@@ -156,3 +156,5 @@ symbian {
 
     symbian:TARGET.UID3 = 0x2002131A
 }
+
+INCLUDEPATH += ../3rdparty/harfbuzz/src
diff --git a/src/openvg/openvg.pro b/src/openvg/openvg.pro
index 619646f..c05af90 100644
--- a/src/openvg/openvg.pro
+++ b/src/openvg/openvg.pro
@@ -60,3 +60,5 @@ contains(QT_CONFIG, openvg_on_opengl) {
     !isEmpty(QMAKE_LIBDIR_OPENGL): LIBS_PRIVATE += -L$$QMAKE_LIBDIR_OPENGL
     !isEmpty(QMAKE_LIBS_OPENGL): LIBS_PRIVATE += $$QMAKE_LIBS_OPENGL
 }
+
+INCLUDEPATH += ../3rdparty/harfbuzz/src
diff --git a/src/plugins/graphicssystems/trace/trace.pro b/src/plugins/graphicssystems/trace/trace.pro
index e57b015..07472e2 100644
--- a/src/plugins/graphicssystems/trace/trace.pro
+++ b/src/plugins/graphicssystems/trace/trace.pro
@@ -10,3 +10,4 @@ SOURCES = main.cpp qgraphicssystem_trace.cpp
 
 target.path += $$[QT_INSTALL_PLUGINS]/graphicssystems
 INSTALLS += target
+INCLUDEPATH += ../../../3rdparty/harfbuzz/src
diff --git a/src/svg/svg.pro b/src/svg/svg.pro
index 4cd8b8b..7b5251a 100644
--- a/src/svg/svg.pro
+++ b/src/svg/svg.pro
@@ -38,6 +38,8 @@ SOURCES += \
         qgraphicssvgitem.cpp    \
         qsvggenerator.cpp
 
+INCLUDEPATH += ../3rdparty/harfbuzz/src
+
 symbian:TARGET.UID3=0x2001B2E2
 
 include(../3rdparty/zlib_dependency.pri)
-- 
cgit v0.12