From fd89fb4566501b3b4a34e25fefa882e97498e3ff Mon Sep 17 00:00:00 2001 From: Lars Knoll Date: Wed, 10 Aug 2016 14:50:28 +0200 Subject: Cleanup QT_NO_FONTCONFIG usage Stop messing around with the define in pro files, and rely on the configuration system. Disable fontconfig on Mac, which in practice gives the same result as before. Change-Id: Iea3aec127af96f221f4ee8682fb20a624332b82f Reviewed-by: Lars Knoll Reviewed-by: Oswald Buddenhagen --- src/platformsupport/fontdatabases/basic/basic.pri | 2 -- src/platformsupport/fontdatabases/fontconfig/fontconfig.pri | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) (limited to 'src/platformsupport') diff --git a/src/platformsupport/fontdatabases/basic/basic.pri b/src/platformsupport/fontdatabases/basic/basic.pri index 52cf771b2a..575c93fe20 100644 --- a/src/platformsupport/fontdatabases/basic/basic.pri +++ b/src/platformsupport/fontdatabases/basic/basic.pri @@ -1,5 +1,3 @@ -DEFINES += QT_NO_FONTCONFIG - HEADERS += \ $$PWD/qbasicfontdatabase_p.h \ $$QT_SOURCE_TREE/src/gui/text/qfontengine_ft_p.h diff --git a/src/platformsupport/fontdatabases/fontconfig/fontconfig.pri b/src/platformsupport/fontdatabases/fontconfig/fontconfig.pri index bd7294b818..63097c33c1 100644 --- a/src/platformsupport/fontdatabases/fontconfig/fontconfig.pri +++ b/src/platformsupport/fontdatabases/fontconfig/fontconfig.pri @@ -2,5 +2,5 @@ HEADERS += $$PWD/qfontconfigdatabase_p.h \ $$PWD/qfontenginemultifontconfig_p.h SOURCES += $$PWD/qfontconfigdatabase.cpp \ $$PWD/qfontenginemultifontconfig.cpp -DEFINES -= QT_NO_FONTCONFIG + QMAKE_CXXFLAGS += $$QMAKE_CFLAGS_FONTCONFIG -- cgit v1.2.3