From 8da530510236061968e46c11f5d266ecb6f68286 Mon Sep 17 00:00:00 2001
From: Simon Hausmann <simon.hausmann@qt.io>
Date: Fri, 30 Aug 2019 15:03:50 +0200
Subject: [PATCH] Fix Harfbuzz detection

We use

    qt_find_package(harfbuzz PROVIDED_TARGETS harfbuzz::harfbuzz)

which would set harfbuzz_FOUND. Since variable names are case-sensitive,
this is also the name we must check for in the qt feature condition.

Change-Id: I43420489c3310bc9c3e5cc798a005c8d5b0ab646
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
---
 src/gui/configure.cmake           | 2 +-
 util/cmake/configurejson2cmake.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/gui/configure.cmake b/src/gui/configure.cmake
index b08320d69fb..ea35cb68878 100644
--- a/src/gui/configure.cmake
+++ b/src/gui/configure.cmake
@@ -566,7 +566,7 @@ qt_feature("fontconfig" PUBLIC PRIVATE
 qt_feature_definition("fontconfig" "QT_NO_FONTCONFIG" NEGATE VALUE "1")
 qt_feature("harfbuzz" PUBLIC PRIVATE
     LABEL "HarfBuzz"
-    CONDITION HARFBUZZ_FOUND
+    CONDITION harfbuzz_FOUND
 )
 qt_feature_definition("harfbuzz" "QT_NO_HARFBUZZ" NEGATE VALUE "1")
 qt_feature("qqnx_imf" PRIVATE
diff --git a/util/cmake/configurejson2cmake.py b/util/cmake/configurejson2cmake.py
index 22e98a68644..69e8627830f 100755
--- a/util/cmake/configurejson2cmake.py
+++ b/util/cmake/configurejson2cmake.py
@@ -660,7 +660,7 @@ def parseFeature(ctx, feature, data, cm_fh):
         },
         'GNUmake': None,
         'harfbuzz': {
-            'condition': 'HARFBUZZ_FOUND'
+            'condition': 'harfbuzz_FOUND'
         },
         'host-dbus': None,
         'iconv': {