diff options
| author | Massimo Callegari <massimocallegari@yahoo.it> | 2018-12-07 17:53:00 +0100 |
|---|---|---|
| committer | Massimo Callegari <massimocallegari@yahoo.it> | 2019-05-03 17:00:42 +0000 |
| commit | ff447717a28392c3b1c103a8ec0d6e2fdcc9cee2 (patch) | |
| tree | a771ddcd63e42623f99584d87bf46949cf34abb0 | |
| parent | 8f24dbaf0703cf792c263d7d26400892c527a712 (diff) | |
configure: skip Freetype/Fontconfig autodetection only on MSVC
In Windows there are package-based systems like MSYS2 that provide
pkg-config for packages lookup.
This change skips autodetection only for MSVC which doesn't
provide the aforementioned feature.
Task-number: QTBUG-57436
Change-Id: Iaed517e93031adbd2fd9dbf350764f76569b94ea
Reviewed-by: Kai Koehne <kai.koehne@qt.io>
| -rw-r--r-- | src/gui/configure.json | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/gui/configure.json b/src/gui/configure.json index 5039934c26..c51e3ceee3 100644 --- a/src/gui/configure.json +++ b/src/gui/configure.json @@ -1206,14 +1206,14 @@ "label": " Using system FreeType", "enable": "input.freetype == 'system'", "disable": "input.freetype == 'qt'", - "autoDetect": "!config.win32", + "autoDetect": "!config.msvc", "condition": "features.freetype && libs.freetype", "output": [ "privateFeature" ] }, "fontconfig": { "label": "Fontconfig", "autoDetect": "!config.darwin", - "condition": "!config.win32 && features.system-freetype && libs.fontconfig", + "condition": "!config.msvc && features.system-freetype && libs.fontconfig", "output": [ "privateFeature", "feature" ] }, "gbm": { |