From: Kent Hansen <kent.hansen@nokia.com>
Date: Fri, 25 Nov 2011 08:20:28 +0000 (+0100)
Subject: Remove harfbuzz cruft from {declarative,qtquick1}.pro
X-Git-Url: http://git.silmor.de/gitweb/?a=commitdiff_plain;h=831486bb2eed0c1d6bcab9fa75baea3d90bd07b1;p=konrad%2Fqtdeclarative.git

Remove harfbuzz cruft from {declarative,qtquick1}.pro

As of b97215b04c0bf12ecfd51ccdeaedd1fab5e8bc03 in qtbase, modules
outside of qtbase can include private text headers without depending
on the harfbuzz sources being present.

Change-Id: Idb3d70d70c1f0f194382a405daa573e66146272a
Reviewed-by: Aaron Kennedy <aaron.kennedy@nokia.com>
---

diff --git a/src/declarative/declarative.pro b/src/declarative/declarative.pro
index 266aa65..a51272b 100644
--- a/src/declarative/declarative.pro
+++ b/src/declarative/declarative.pro
@@ -40,8 +40,3 @@ HEADERS += qtquick2_p.h
 SOURCES += qtquick2.cpp
 
 linux-g++-maemo:DEFINES += QDECLARATIVEVIEW_NOBACKGROUND
-
-DEFINES += QT_NO_OPENTYPE
-INCLUDEPATH += $$QT_SOURCE_TREE/src/3rdparty/harfbuzz/src
-
-
diff --git a/src/qtquick1/qtquick1.pro b/src/qtquick1/qtquick1.pro
index e06914f..c59f1af 100644
--- a/src/qtquick1/qtquick1.pro
+++ b/src/qtquick1/qtquick1.pro
@@ -39,9 +39,6 @@ include(graphicsitems/graphicsitems.pri)
 HEADERS += qtquick1_p.h
 SOURCES += qtquick1.cpp
 
-DEFINES += QT_NO_OPENTYPE
-INCLUDEPATH +=  $$QT.corelib.sources/../src/3rdparty/harfbuzz/src
-
 mac {
     # FIXME: this is a workaround for broken qmake logic in qtAddModule()
     # This function refuses to use frameworks unless the framework exists on