summaryrefslogtreecommitdiffstats
path: root/src/gui
diff options
context:
space:
mode:
authorOswald Buddenhagen <oswald.buddenhagen@qt.io>2017-12-07 11:59:30 +0100
committerOswald Buddenhagen <oswald.buddenhagen@qt.io>2018-01-18 13:54:25 +0000
commit016ab238b66d84a58b665782d25daaffdf1708bd (patch)
tree954c4aa9c316298c1b5cd63a99bad646aa4d1063 /src/gui
parentf6f6958a3e71230d4f2ef4db54d8d7fa010fa58b (diff)
configure: express dependency of fontconfig on freetype more clearly
use a "use" entry instead of including the transitive dep into the list of libraries. this also removes the redundant check of freetype features from the fontconfig test code. Change-Id: I86b78028255c9bf0a62be5ec0f97a62ef3fda36f Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'src/gui')
-rw-r--r--src/gui/configure.json13
1 files changed, 4 insertions, 9 deletions
diff --git a/src/gui/configure.json b/src/gui/configure.json
index f7377eb903..1e4e56422f 100644
--- a/src/gui/configure.json
+++ b/src/gui/configure.json
@@ -164,25 +164,20 @@
"label": "Fontconfig",
"test": {
"head": [
- "#include <ft2build.h>",
- "#include FT_FREETYPE_H",
"#include <fontconfig/fontconfig.h>",
"#ifndef FC_RGBA_UNKNOWN",
"# error This version of fontconfig is tool old, it is missing the FC_RGBA_UNKNOWN define",
- "#endif",
- "#if ((FREETYPE_MAJOR*10000 + FREETYPE_MINOR*100 + FREETYPE_PATCH) < 20110)",
- "# error This version of freetype is too old.",
"#endif"
],
"main": [
- "FT_Face face = 0;",
"FcPattern *pattern = 0;"
]
},
"sources": [
- { "type": "pkgConfig", "args": "fontconfig freetype2" },
- { "type": "freetype", "libs": "-lfontconfig -lfreetype" }
- ]
+ { "type": "pkgConfig", "args": "fontconfig" },
+ { "type": "freetype", "libs": "-lfontconfig" }
+ ],
+ "use": "freetype"
},
"gbm": {
"label": "GBM",