summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRitt Konstantin <ritt.ks@gmail.com>2011-01-20 11:07:14 (GMT)
committerOswald Buddenhagen <oswald.buddenhagen@nokia.com>2011-01-20 15:38:01 (GMT)
commit6551a2933126cc86ac4c1e5265e967100d240fb0 (patch)
treef6467599ccae920fd31a90e7998f647b0817f350
parentb47c43e8774cf0126c53dd71dc8969dfeab84405 (diff)
downloadQt-6551a2933126cc86ac4c1e5265e967100d240fb0.zip
Qt-6551a2933126cc86ac4c1e5265e967100d240fb0.tar.gz
Qt-6551a2933126cc86ac4c1e5265e967100d240fb0.tar.bz2
don't include harfbuzz where we don't use it
this only added extra noise to the output... Merge-request: 1028 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com> Reviewed-by: mariusSO
-rw-r--r--src/declarative/declarative.pro2
-rw-r--r--src/opengl/opengl.pro2
-rw-r--r--src/openvg/openvg.pro2
-rw-r--r--src/plugins/graphicssystems/trace/trace.pro1
-rw-r--r--src/svg/svg.pro2
5 files changed, 0 insertions, 9 deletions
diff --git a/src/declarative/declarative.pro b/src/declarative/declarative.pro
index 1ad888b..d2c035c 100644
--- a/src/declarative/declarative.pro
+++ b/src/declarative/declarative.pro
@@ -30,5 +30,3 @@ symbian: {
}
DEFINES += QT_NO_OPENTYPE
-INCLUDEPATH += ../3rdparty/harfbuzz/src
-
diff --git a/src/opengl/opengl.pro b/src/opengl/opengl.pro
index 0e82467..45cb750 100644
--- a/src/opengl/opengl.pro
+++ b/src/opengl/opengl.pro
@@ -156,5 +156,3 @@ symbian {
symbian:TARGET.UID3 = 0x2002131A
}
-
-INCLUDEPATH += ../3rdparty/harfbuzz/src
diff --git a/src/openvg/openvg.pro b/src/openvg/openvg.pro
index c05af90..619646f 100644
--- a/src/openvg/openvg.pro
+++ b/src/openvg/openvg.pro
@@ -60,5 +60,3 @@ 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 07472e2..e57b015 100644
--- a/src/plugins/graphicssystems/trace/trace.pro
+++ b/src/plugins/graphicssystems/trace/trace.pro
@@ -10,4 +10,3 @@ 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 7b5251a..4cd8b8b 100644
--- a/src/svg/svg.pro
+++ b/src/svg/svg.pro
@@ -38,8 +38,6 @@ SOURCES += \
qgraphicssvgitem.cpp \
qsvggenerator.cpp
-INCLUDEPATH += ../3rdparty/harfbuzz/src
-
symbian:TARGET.UID3=0x2001B2E2
include(../3rdparty/zlib_dependency.pri)