whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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>
bb10
Oswald Buddenhagen 2016-10-12 10:35:55 +02:00 committed by Oswald Buddenhagen
parent 936e132122
commit 81755e9623
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
mkspecs/features/qpa/genericunixfontdatabase.prf
View File

@ -1,6 +1,5 @@
CONFIG += qpa/basicunixfontdatabase
qtConfig(fontconfig) {
DEFINES += Q_FONTCONFIGDATABASE
QMAKE_USE_PRIVATE += fontconfig/linkonly
}

4
src/platformsupport/fontdatabases/genericunix/qgenericunixfontdatabase_p.h
View File

@ -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