AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix passing FREETYPE_LIBS and friends to configure

Browse Source 
On systems where the pkg-config source fails, configure falls back to
a library source of the type 'freetype'. This ignored variables like
FREETYPE_LIBS users can pass to configure.

The qtConfLibrary_freetype function now diverts to
qtConfLibrary_inline which handles all those variables.

Change-Id: Icef70deb130ce6d2de1520af4344ccccd677f287
Fixes: QTBUG-77643
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
This commit is contained in:
Joerg Bornemann 2019-09-13 14:20:48 +02:00
parent 392931662d
commit 20d8186c24
1 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/gui/configure.pri
View File

@ -1,18 +1,22 @@
# custom tests # custom tests
defineTest(qtConfLibrary_freetype) { defineTest(qtConfLibrary_freetype) {
input = $$eval($${2}.alias)
isEmpty(config.input.$${input}.incdir) {
TRY_INCLUDEPATHS = $$EXTRA_INCLUDEPATH $$QMAKE_INCDIR_X11 TRY_INCLUDEPATHS = $$EXTRA_INCLUDEPATH $$QMAKE_INCDIR_X11
haiku: TRY_INCLUDEPATHS += /system/develop/headers haiku: TRY_INCLUDEPATHS += /system/develop/headers
TRY_INCLUDEPATHS += $$QMAKE_DEFAULT_INCDIRS TRY_INCLUDEPATHS += $$QMAKE_DEFAULT_INCDIRS
for (p, TRY_INCLUDEPATHS) { for (p, TRY_INCLUDEPATHS) {
includedir = $$p/freetype2 includedir = $$p/freetype2
exists($$includedir) { exists($$includedir) {
$${1}.includedir = $$includedir config.input.$${input}.incdir = $$includedir
export($${1}.includedir) export(config.input.$${input}.incdir)
return(true) break()
} }
} }
return(true) }
qtConfLibrary_inline($$1, $$2): return(true)
return(false)
} }
# Check for Direct X shader compiler 'fxc'. # Check for Direct X shader compiler 'fxc'.