1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

qpa: Use LIBS_PRIVATE, not LIBS when linking in font database bits.

Browse Source 
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 <oswald.buddenhagen@theqtcompany.com>
This commit is contained in:
Robin Burchell 2016-05-19 12:37:10 +02:00
parent eff3a7ded1
commit b2e9c680e3
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mkspecs/features/qpa/basicunixfontdatabase.prf
View File

@ -1,3 +1,3 @@
contains(QT_CONFIG, system-freetype) {
LIBS += -lfreetype
LIBS_PRIVATE += -lfreetype
}

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

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