diff options
| author | Girish Ramakrishnan <girish.1.ramakrishnan@nokia.com> | 2012-03-15 23:20:53 -0700 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-03-16 21:30:59 +0100 |
| commit | b84ff8525cc9ec08de710a8c1fed8d88f44f6543 (patch) | |
| tree | e4340293b21c655dbd66bdbb55bc408baff3bc4c /mkspecs/features | |
| parent | c0791b86ab4b006f9ab2b7f932d5c76a159f6c08 (diff) | |
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>
Diffstat (limited to 'mkspecs/features')
| -rw-r--r-- | mkspecs/features/qpa/genericunixfontdatabase.prf | 5 | ||||
| -rw-r--r-- | mkspecs/features/qt_installs.prf | 6 |
2 files changed, 5 insertions, 6 deletions
diff --git a/mkspecs/features/qpa/genericunixfontdatabase.prf b/mkspecs/features/qpa/genericunixfontdatabase.prf index 20b31a7e67..36a358271c 100644 --- a/mkspecs/features/qpa/genericunixfontdatabase.prf +++ b/mkspecs/features/qpa/genericunixfontdatabase.prf @@ -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 } + diff --git a/mkspecs/features/qt_installs.prf b/mkspecs/features/qt_installs.prf index 8b17aa90fb..97e52f670d 100644 --- a/mkspecs/features/qt_installs.prf +++ b/mkspecs/features/qt_installs.prf @@ -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/* -} |