summaryrefslogtreecommitdiffstats
path: root/src/gui/configure.json
diff options
context:
space:
mode:
authorDimitrios Apostolou <jimis@qt.io>2020-07-15 13:31:38 +0200
committerDimitrios Apostolou <jimis@qt.io>2020-09-16 20:18:26 +0200
commitbf075da8004718e6a7e8d3870b912e89cea8d08c (patch)
tree921cebddc67b1f9b2550dc2a6f0b3fd75d9cad53 /src/gui/configure.json
parentb9c85d6b0e274bf0a6287cd56d9e3d7376b0d004 (diff)
Include harfbuzz header files without harfbuzz/ parent directory
This is in accordance to the examples from harfbuzz docs: https://harfbuzz.github.io/ch03s03.html The fix is because `pkg-config --cflags harfbuzz` returns the subdirectory as include path, for example: -I /usr/local/include/harfbuzz and this caused the system-harfbuzz not to be found when /usr/local/include was not included by default (recent change on macOS) and the code was doing #include <harfbuzz/hb.h>. Fixes: QTBUG-85568 Change-Id: I12a34638e8ad5e3085768828457f0bfa1a2c68ad Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io> Reviewed-by: Konstantin Ritt <ritt.ks@gmail.com>
Diffstat (limited to 'src/gui/configure.json')
-rw-r--r--src/gui/configure.json2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/configure.json b/src/gui/configure.json
index 80df53edd1..d5816c5968 100644
--- a/src/gui/configure.json
+++ b/src/gui/configure.json
@@ -236,7 +236,7 @@
"hb_buffer_destroy(buffer);"
]
},
- "headers": "harfbuzz/hb.h",
+ "headers": "hb.h",
"sources": [
"-lharfbuzz"
]