qt-system-harfbuzz.diff

diff --git a/src/gui/configure.json b/src/gui/configure.json
index 0202f17b21..c095859ca6 100644
--- a/src/gui/configure.json
+++ b/src/gui/configure.json
@@ -302,8 +302,9 @@
                     "hb_buffer_destroy(buffer);"
                 ]
             },
-            "headers": "harfbuzz/hb.h",
+            "headers": "hb.h",
             "sources": [
+                { "type": "pkgConfig", "args": "harfbuzz" },
                 "-lharfbuzz"
             ]
         },
diff --git a/src/gui/text/qfontengine.cpp b/src/gui/text/qfontengine.cpp
index 819b2d14f8a..07b19d4d19a 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/qtbase/src/gui/text/qharfbuzzng_p.h.old b/qtbase/src/gui/text/qharfbuzzng_p.h
index fabf222..54dbcfc 100644
--- a/src/gui/text/qharfbuzzng_p.h
+++ b/src/gui/text/qharfbuzzng_p.h
@@ -58,7 +58,7 @@ QT_REQUIRE_CONFIG(harfbuzz);
 
 #include <QtCore/qchar.h>
 
-#include <harfbuzz/hb.h>
+#include <hb.h>
 
 QT_BEGIN_NAMESPACE