From b2e9c680e3e3f446e84748fc5068d527daf10b62 Mon Sep 17 00:00:00 2001 From: Robin Burchell Date: Thu, 19 May 2016 12:37:10 +0200 Subject: [PATCH] qpa: Use LIBS_PRIVATE, not LIBS when linking in font database bits. LIBS_PRIVATE is more correct (these shouldn't be part of the public API), and additionally, using LIBS_PRIVATE also ensures these libraries come last on the link command, which fixes builds using -Wl,--as-needed. Change-Id: I9f2e4e78855a30a53ce9013623597b840a2832bd Reviewed-by: Oswald Buddenhagen --- mkspecs/features/qpa/basicunixfontdatabase.prf | 2 +- 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 261eadb5d02..f2e4016c997 100644 --- a/mkspecs/features/qpa/basicunixfontdatabase.prf +++ b/mkspecs/features/qpa/basicunixfontdatabase.prf @@ -1,3 +1,3 @@ contains(QT_CONFIG, system-freetype) { - LIBS += -lfreetype + LIBS_PRIVATE += -lfreetype } diff --git a/mkspecs/features/qpa/genericunixfontdatabase.prf b/mkspecs/features/qpa/genericunixfontdatabase.prf index fc11bea4707..b0d81e5571e 100644 --- a/mkspecs/features/qpa/genericunixfontdatabase.prf +++ b/mkspecs/features/qpa/genericunixfontdatabase.prf @@ -1,7 +1,7 @@ CONFIG += qpa/basicunixfontdatabase contains(QT_CONFIG, fontconfig) { DEFINES += Q_FONTCONFIGDATABASE - LIBS += -lfontconfig + LIBS_PRIVATE += -lfontconfig } else:!android { fonts.path = $$[QT_INSTALL_LIBS]/fonts fonts.files = $$QT_SOURCE_TREE/lib/fonts/*