diff options
| -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/* -} |