Commit b84ff852 authored by Girish Ramakrishnan's avatar Girish Ramakrishnan Committed by Qt by Nokia
Browse files

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: default avatarJohannes Zellner <johannes.zellner@nokia.com>
Reviewed-by: default avatarDonald Carr <donald.carr@nokia.com>
Reviewed-by: default avatarOswald Buddenhagen <oswald.buddenhagen@nokia.com>
Reviewed-by: default avatarSamuel Rødal <samuel.rodal@nokia.com>
parent c0791b86
Branches
Tags
No related merge requests found
Showing with 5 additions and 6 deletions
...@@ -2,4 +2,9 @@ CONFIG += qpa/basicunixfontdatabase ...@@ -2,4 +2,9 @@ CONFIG += qpa/basicunixfontdatabase
contains(QT_CONFIG, fontconfig) { contains(QT_CONFIG, fontconfig) {
DEFINES += Q_FONTCONFIGDATABASE DEFINES += Q_FONTCONFIGDATABASE
LIBS += -lfontconfig 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 { ...@@ -35,9 +35,3 @@ qt_install_headers {
INSTALLS += private_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/*
}
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment