diff options
| author | Kent Hansen <kent.hansen@nokia.com> | 2011-11-25 09:20:28 +0100 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2011-11-25 12:06:23 +0100 |
| commit | 831486bb2eed0c1d6bcab9fa75baea3d90bd07b1 (patch) | |
| tree | e04835b6fe10321f962c955bea9303a9040065ab | |
| parent | fab28e815819e297d2205dae5b6187b0c625958e (diff) | |
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>
| -rw-r--r-- | src/declarative/declarative.pro | 5 | ||||
| -rw-r--r-- | src/qtquick1/qtquick1.pro | 3 |
2 files changed, 0 insertions, 8 deletions
diff --git a/src/declarative/declarative.pro b/src/declarative/declarative.pro index 266aa65b4a..a51272bd6e 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 e06914f5ee..c59f1af07d 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 |