diff options
author | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2016-09-28 18:04:41 +0200 |
---|---|---|
committer | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2016-10-04 20:20:39 +0000 |
commit | 57987ad57139be7b29e74d7eb60777b3ebb9e271 (patch) | |
tree | c93872d73171f8dd94e245cb3778e5a76c6dd461 /src/gui/configure.pri | |
parent | cd8b7fb86517cda1adbfe8fda7beaafddfe5c9bb (diff) |
fix freetype/fontconfig configure system
convert the ugly config.tests/[...]/freetype.pri file into a custom
callback in configure.pri, and reinstate pkg-config use for freetype.
subsequently, use QMAKE_USE for the actual library references.
this fixes in particular cross-builds, as the new configure was not
passing the necessary information to the test any more, so the old .pri
file misbehaved.
Task-number: QTBUG-54911
Change-Id: I5fc9c254334a2675f7db4d54df4c77637e8e2487
Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>
Diffstat (limited to 'src/gui/configure.pri')
-rw-r--r-- | src/gui/configure.pri | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/src/gui/configure.pri b/src/gui/configure.pri index d79c5a6bba..10e50d3654 100644 --- a/src/gui/configure.pri +++ b/src/gui/configure.pri @@ -1,5 +1,20 @@ # custom tests +defineTest(qtConfLibrary_freetype) { + TRY_INCLUDEPATHS = $$EXTRA_INCLUDEPATH $$QMAKE_INCDIR_X11 + haiku: TRY_INCLUDEPATHS += /system/develop/headers + TRY_INCLUDEPATHS += $$QMAKE_DEFAULT_INCDIR + for (p, TRY_INCLUDEPATHS) { + includedir = $$p/freetype2 + exists($$includedir) { + $${1}.includedir = "$$val_escape(includedir)" + export($${1}.includedir) + return(true) + } + } + return(false) +} + # Check for Direct X SDK (include, lib, and direct shader compiler 'fxc'). # Up to Direct X SDK June 2010 and for MinGW, this is pointed to by the # DXSDK_DIR variable. Starting with Windows Kit 8, it is included in |