diff options
Diffstat (limited to 'mkspecs/features')
| -rw-r--r-- | mkspecs/features/qpa/basicunixfontdatabase.prf | 5 | ||||
| -rw-r--r-- | mkspecs/features/qpa/genericunixfontdatabase.prf | 5 | ||||
| -rw-r--r-- | mkspecs/features/qt_functions.prf | 2 |
3 files changed, 11 insertions, 1 deletions
diff --git a/mkspecs/features/qpa/basicunixfontdatabase.prf b/mkspecs/features/qpa/basicunixfontdatabase.prf new file mode 100644 index 0000000000..65490e03a8 --- /dev/null +++ b/mkspecs/features/qpa/basicunixfontdatabase.prf @@ -0,0 +1,5 @@ +DEFINES += QT_COMPILES_IN_HARFBUZZ + +contains(QT_CONFIG, system-freetype) { + LIBS += -lfreetype +} diff --git a/mkspecs/features/qpa/genericunixfontdatabase.prf b/mkspecs/features/qpa/genericunixfontdatabase.prf new file mode 100644 index 0000000000..20b31a7e67 --- /dev/null +++ b/mkspecs/features/qpa/genericunixfontdatabase.prf @@ -0,0 +1,5 @@ +CONFIG += qpa/basicunixfontdatabase +contains(QT_CONFIG, fontconfig) { + DEFINES += Q_FONTCONFIGDATABASE + LIBS += -lfontconfig +} diff --git a/mkspecs/features/qt_functions.prf b/mkspecs/features/qt_functions.prf index 50a85d86ce..86d80cb239 100644 --- a/mkspecs/features/qt_functions.prf +++ b/mkspecs/features/qt_functions.prf @@ -142,7 +142,7 @@ defineTest(qtAddModule) { # Make sure we can link to uninstalled libraries !isEqual(MODULE_LIBS, $[QT_INSTALL_LIBS]) { QMAKE_LIBDIR *= $$MODULE_LIBS - unix:QMAKE_LFLAGS *= "-Wl,-rpath-link,$$MODULE_LIBS" + unix:!mac:QMAKE_LFLAGS *= "-Wl,-rpath-link,$$MODULE_LIBS" } if(!debug_and_release|build_pass):CONFIG(debug, debug|release) { win32:LINKAGE = -l$${MODULE_NAME}$${QT_LIBINFIX}d |