summaryrefslogtreecommitdiffstats
path: root/src/gui
diff options
context:
space:
mode:
authorKonstantin Ritt <ritt.ks@gmail.com>2014-02-25 15:33:43 +0200
committerThe Qt Project <gerrit-noreply@qt-project.org>2014-03-14 18:18:26 +0100
commita7e58bf253d08b896df3bbf247bbbaae718e426d (patch)
treef54af4053622902ea9e0dfae2bac778799b82d18 /src/gui
parent4dcf40b30894c0535f8a06235d01928cd434819d (diff)
Build bundled HarfBuzz-NG outside QtGui
Being a part of QtGui, HarfBuzz-NG breaks build with -Werror. Instead of disabling a particular warnings-as-errors, build a prefixed static library and make it a link-time dependency. Change-Id: Id0be1f0e0034092d50f83cd364d5c65940fee869 Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Diffstat (limited to 'src/gui')
-rw-r--r--src/gui/text/text.pri2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/text/text.pri b/src/gui/text/text.pri
index 2a0e4eff32..c67769ad48 100644
--- a/src/gui/text/text.pri
+++ b/src/gui/text/text.pri
@@ -88,7 +88,7 @@ HEADERS += \
contains(QT_CONFIG, harfbuzz)|contains(QT_CONFIG, system-harfbuzz) {
DEFINES += QT_ENABLE_HARFBUZZ_NG
- include($$PWD/../../3rdparty/harfbuzz.pri)
+ include($$PWD/../../3rdparty/harfbuzzng.pri)
SOURCES += text/qharfbuzzng.cpp
HEADERS += text/qharfbuzzng_p.h