From 57987ad57139be7b29e74d7eb60777b3ebb9e271 Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Wed, 28 Sep 2016 18:04:41 +0200 Subject: fix freetype/fontconfig configure system convert the ugly config.tests/[...]/freetype.pri file into a custom callback in configure.pri, and reinstate pkg-config use for freetype. subsequently, use QMAKE_USE for the actual library references. this fixes in particular cross-builds, as the new configure was not passing the necessary information to the test any more, so the old .pri file misbehaved. Task-number: QTBUG-54911 Change-Id: I5fc9c254334a2675f7db4d54df4c77637e8e2487 Reviewed-by: Laszlo Agocs --- src/platformsupport/fontdatabases/fontconfig/fontconfig.pri | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/platformsupport') diff --git a/src/platformsupport/fontdatabases/fontconfig/fontconfig.pri b/src/platformsupport/fontdatabases/fontconfig/fontconfig.pri index 63097c33c1..911f0c884d 100644 --- a/src/platformsupport/fontdatabases/fontconfig/fontconfig.pri +++ b/src/platformsupport/fontdatabases/fontconfig/fontconfig.pri @@ -3,4 +3,4 @@ HEADERS += $$PWD/qfontconfigdatabase_p.h \ SOURCES += $$PWD/qfontconfigdatabase.cpp \ $$PWD/qfontenginemultifontconfig.cpp -QMAKE_CXXFLAGS += $$QMAKE_CFLAGS_FONTCONFIG +QMAKE_USE += fontconfig/nolink -- cgit v1.2.3