From bf075da8004718e6a7e8d3870b912e89cea8d08c Mon Sep 17 00:00:00 2001
From: Dimitrios Apostolou <jimis@qt.io>
Date: Wed, 15 Jul 2020 13:31:38 +0200
Subject: Include harfbuzz header files without harfbuzz/ parent directory
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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>
---
 src/gui/configure.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/gui/configure.json')

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"
             ]
-- 
cgit v1.2.3