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/3rdparty/harfbuzz-ng/.prev_CMakeLists.txt | 2 +-
 src/3rdparty/harfbuzz-ng/CMakeLists.txt       | 2 +-
 src/3rdparty/harfbuzz-ng/harfbuzz-ng.pro      | 2 +-
 src/gui/configure.json                        | 2 +-
 src/gui/text/qfontengine.cpp                  | 2 +-
 src/gui/text/qharfbuzzng_p.h                  | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/3rdparty/harfbuzz-ng/.prev_CMakeLists.txt b/src/3rdparty/harfbuzz-ng/.prev_CMakeLists.txt
index f8d1a77a75..b178d205d5 100644
--- a/src/3rdparty/harfbuzz-ng/.prev_CMakeLists.txt
+++ b/src/3rdparty/harfbuzz-ng/.prev_CMakeLists.txt
@@ -59,7 +59,7 @@ qt_add_3rdparty_library(BundledHarfbuzz
     INCLUDE_DIRECTORIES
         .core.includes
     PUBLIC_INCLUDE_DIRECTORIES
-        $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
+        $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include/harfbuzz>
 )
 qt_disable_warnings(BundledHarfbuzz)
 qt_set_symbol_visibility_hidden(BundledHarfbuzz)
diff --git a/src/3rdparty/harfbuzz-ng/CMakeLists.txt b/src/3rdparty/harfbuzz-ng/CMakeLists.txt
index a76cc629c8..2f895ab4d3 100644
--- a/src/3rdparty/harfbuzz-ng/CMakeLists.txt
+++ b/src/3rdparty/harfbuzz-ng/CMakeLists.txt
@@ -61,7 +61,7 @@ qt_add_3rdparty_library(BundledHarfbuzz
         $<TARGET_PROPERTY:Core,INCLUDE_DIRECTORIES> # special case
         "${CMAKE_CURRENT_SOURCE_DIR}" # special case
     PUBLIC_INCLUDE_DIRECTORIES
-        $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
+        $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include/harfbuzz>
 )
 qt_disable_warnings(BundledHarfbuzz)
 qt_set_symbol_visibility_hidden(BundledHarfbuzz)
diff --git a/src/3rdparty/harfbuzz-ng/harfbuzz-ng.pro b/src/3rdparty/harfbuzz-ng/harfbuzz-ng.pro
index 1c6eb992f0..752d349ebc 100644
--- a/src/3rdparty/harfbuzz-ng/harfbuzz-ng.pro
+++ b/src/3rdparty/harfbuzz-ng/harfbuzz-ng.pro
@@ -5,7 +5,7 @@ CONFIG += \
     hide_symbols \
     exceptions_off rtti_off warn_off
 
-MODULE_INCLUDEPATH += $$PWD/include
+MODULE_INCLUDEPATH += $$PWD/include/harfbuzz
 
 load(qt_helper_lib)
 
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"
             ]
diff --git a/src/gui/text/qfontengine.cpp b/src/gui/text/qfontengine.cpp
index 819b2d14f8..07b19d4d19 100644
--- a/src/gui/text/qfontengine.cpp
+++ b/src/gui/text/qfontengine.cpp
@@ -55,7 +55,7 @@
 
 #if QT_CONFIG(harfbuzz)
 #  include "qharfbuzzng_p.h"
-#  include <harfbuzz/hb-ot.h>
+#  include <hb-ot.h>
 #endif
 
 #include <algorithm>
diff --git a/src/gui/text/qharfbuzzng_p.h b/src/gui/text/qharfbuzzng_p.h
index 4fb7e0aef7..a7cd84fedc 100644
--- a/src/gui/text/qharfbuzzng_p.h
+++ b/src/gui/text/qharfbuzzng_p.h
@@ -59,7 +59,7 @@ QT_REQUIRE_CONFIG(harfbuzz);
 #include <QtCore/qchar.h>
 
 #if defined(QT_BUILD_GUI_LIB)
-#  include <harfbuzz/hb.h>
+#  include <hb.h>
 #else
 // a minimal set of HB types required for Qt libs other than Gui
 
-- 
cgit v1.2.3