From 81755e96230753fc70cecf3c6be28237015cdf9b Mon Sep 17 00:00:00 2001
From: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
Date: Wed, 12 Oct 2016 10:35:55 +0200
Subject: [PATCH] get rid of Q_FONTCONFIGDATABASE define

use fontconfig feature directly instead.
easier to understand data flow, and less noisy compiler command lines.

Change-Id: If80af4b08933049d553df685b41422d15e1e4f5c
Reviewed-by: Jake Petroules <jake.petroules@qt.io>
---
 mkspecs/features/qpa/genericunixfontdatabase.prf              | 1 -
 .../fontdatabases/genericunix/qgenericunixfontdatabase_p.h    | 4 ++--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/mkspecs/features/qpa/genericunixfontdatabase.prf b/mkspecs/features/qpa/genericunixfontdatabase.prf
index ef8384a245..3b34eb0624 100644
--- a/mkspecs/features/qpa/genericunixfontdatabase.prf
+++ b/mkspecs/features/qpa/genericunixfontdatabase.prf
@@ -1,6 +1,5 @@
 CONFIG += qpa/basicunixfontdatabase
 qtConfig(fontconfig) {
-    DEFINES += Q_FONTCONFIGDATABASE
     QMAKE_USE_PRIVATE += fontconfig/linkonly
 }
 
diff --git a/src/platformsupport/fontdatabases/genericunix/qgenericunixfontdatabase_p.h b/src/platformsupport/fontdatabases/genericunix/qgenericunixfontdatabase_p.h
index 043f831530..267ef5e3f2 100644
--- a/src/platformsupport/fontdatabases/genericunix/qgenericunixfontdatabase_p.h
+++ b/src/platformsupport/fontdatabases/genericunix/qgenericunixfontdatabase_p.h
@@ -51,9 +51,9 @@
 // We mean it.
 //
 
-#include <QtCore/qglobal.h>
+#include <QtGui/private/qtguiglobal_p.h>
 
-#ifdef Q_FONTCONFIGDATABASE
+#if QT_CONFIG(fontconfig)
 #include <QtPlatformSupport/private/qfontconfigdatabase_p.h>
 typedef QFontconfigDatabase QGenericUnixFontDatabase;
 #else