Install fonts when not using fontconfig
When built without fontconfig support, the basic unix font database relies on fonts installed in libs/fonts to populate the database. Change-Id: Id1e54c5b032095470049210bb831cfe4c79b3569 Reviewed-by: Johannes Zellner <johannes.zellner@nokia.com> Reviewed-by: Donald Carr <donald.carr@nokia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com> Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
This commit is contained in:
parent
c0791b86ab
commit
b84ff8525c
@ -2,4 +2,9 @@ CONFIG += qpa/basicunixfontdatabase
|
||||
contains(QT_CONFIG, fontconfig) {
|
||||
DEFINES += Q_FONTCONFIGDATABASE
|
||||
LIBS += -lfontconfig
|
||||
} else {
|
||||
fonts.path = $$[QT_INSTALL_LIBS]/fonts
|
||||
fonts.files = $$QT_SOURCE_TREE/lib/fonts/*
|
||||
INSTALLS += fonts
|
||||
}
|
||||
|
||||
|
@ -35,9 +35,3 @@ qt_install_headers {
|
||||
INSTALLS += private_headers
|
||||
}
|
||||
|
||||
embedded: equals(TARGET, QtGui) {
|
||||
# install fonts for embedded
|
||||
INSTALLS += fonts
|
||||
fonts.path = $$[QT_INSTALL_LIBS]/fonts
|
||||
fonts.files = $$QT_SOURCE_TREE/lib/fonts/*
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user