diff options
| author | Liang Qi <liang.qi@qt.io> | 2019-05-07 10:52:53 +0000 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2019-05-07 13:28:29 +0000 |
| commit | 35b25bc91784f5a39ee034a99167d5bfee49f74b (patch) | |
| tree | f6198a2b9f4456c05f3399d60e95da57499b0036 /src/gui/configure.json | |
| parent | aea6ff4f57135b0f2f076e86e22cb87c0a7014fe (diff) | |
| parent | c2b553784dfbe0ece90f79709639e27e74359a7d (diff) | |
Merge "Merge remote-tracking branch 'origin/5.13' into dev" into refs/staging/dev
Diffstat (limited to 'src/gui/configure.json')
| -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 9e76fc455e..912ad741e0 100644 --- a/src/gui/configure.json +++ b/src/gui/configure.json @@ -1203,14 +1203,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": { |