diff options
author | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2016-09-28 18:04:41 +0200 |
---|---|---|
committer | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2016-10-04 20:20:39 +0000 |
commit | 57987ad57139be7b29e74d7eb60777b3ebb9e271 (patch) | |
tree | c93872d73171f8dd94e245cb3778e5a76c6dd461 /mkspecs | |
parent | cd8b7fb86517cda1adbfe8fda7beaafddfe5c9bb (diff) |
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 <laszlo.agocs@qt.io>
Diffstat (limited to 'mkspecs')
-rw-r--r-- | mkspecs/features/qpa/basicunixfontdatabase.prf | 2 | ||||
-rw-r--r-- | mkspecs/features/qpa/genericunixfontdatabase.prf | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/mkspecs/features/qpa/basicunixfontdatabase.prf b/mkspecs/features/qpa/basicunixfontdatabase.prf index 80382da214..72449c8f6b 100644 --- a/mkspecs/features/qpa/basicunixfontdatabase.prf +++ b/mkspecs/features/qpa/basicunixfontdatabase.prf @@ -1,3 +1,3 @@ qtConfig(system-freetype) { - LIBS_PRIVATE += -lfreetype + QMAKE_USE_PRIVATE += freetype/linkonly } diff --git a/mkspecs/features/qpa/genericunixfontdatabase.prf b/mkspecs/features/qpa/genericunixfontdatabase.prf index 3680d5ad79..75edabeaa3 100644 --- a/mkspecs/features/qpa/genericunixfontdatabase.prf +++ b/mkspecs/features/qpa/genericunixfontdatabase.prf @@ -1,7 +1,7 @@ CONFIG += qpa/basicunixfontdatabase qtConfig(fontconfig) { DEFINES += Q_FONTCONFIGDATABASE - LIBS_PRIVATE += -lfontconfig + QMAKE_USE_PRIVATE += fontconfig/linkonly } else:!android { fonts.path = $$[QT_INSTALL_LIBS]/fonts fonts.files = $$QT_SOURCE_TREE/lib/fonts/* |