diff options
| author | Kent Hansen <kent.hansen@nokia.com> | 2012-03-19 10:03:48 +0100 |
|---|---|---|
| committer | Kent Hansen <kent.hansen@nokia.com> | 2012-03-19 10:03:48 +0100 |
| commit | 95d6f8a4cf3fba2fd675f0e6b5de0ce1d702da26 (patch) | |
| tree | a0bb36e478c97761afa36baf8026726b3d2fdbc8 /mkspecs/features/qpa/genericunixfontdatabase.prf | |
| parent | 3f64a7b67bfbcaab65ebb03f84962cce5834790b (diff) | |
| parent | 25e004bfe493e18be255b057ae5c132a5ec5458b (diff) | |
Merge master into api_changes
Conflicts:
src/corelib/tools/qvector.h
tests/auto/corelib/kernel/qmetatype/tst_qmetatype.cpp
Change-Id: I877256e95f3788e617437f4e9661a88047f38cd6
Diffstat (limited to 'mkspecs/features/qpa/genericunixfontdatabase.prf')
| -rw-r--r-- | mkspecs/features/qpa/genericunixfontdatabase.prf | 5 |
1 files changed, 5 insertions, 0 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 } + |