diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2020-06-22 14:35:25 +0200 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2020-06-22 22:25:46 +0200 |
| commit | 04b120bc3c6fd20ff47582fd4e0ba30e1f3677ae (patch) | |
| tree | 5d230662a4795fb34232376c37c1e3cba4eb655f /src | |
| parent | ffb73175e6c5b35e6367c88479cc0bf160482016 (diff) | |
Prospective fix for trying to build FontConfig on Windows
Strawberry Perl has been found to ship a libfontconfig.
Change the exclusion to win32.
Fixes: QTBUG-85184
Change-Id: Ic953ba3226c275a204720ff83161fba138eae0cb
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
Diffstat (limited to 'src')
| -rw-r--r-- | src/gui/.prev_configure.cmake | 6 | ||||
| -rw-r--r-- | src/gui/configure.cmake | 2 | ||||
| -rw-r--r-- | src/gui/configure.json | 2 |
3 files changed, 7 insertions, 3 deletions
diff --git a/src/gui/.prev_configure.cmake b/src/gui/.prev_configure.cmake index 04d8321725..76bc14d8c3 100644 --- a/src/gui/.prev_configure.cmake +++ b/src/gui/.prev_configure.cmake @@ -585,7 +585,7 @@ qt_feature("system-freetype" PRIVATE qt_feature("fontconfig" PUBLIC PRIVATE LABEL "Fontconfig" AUTODETECT NOT APPLE - CONDITION NOT MSVC AND QT_FEATURE_system_freetype AND FONTCONFIG_FOUND + CONDITION NOT WIN32 AND QT_FEATURE_system_freetype AND FONTCONFIG_FOUND ) qt_feature_definition("fontconfig" "QT_NO_FONTCONFIG" NEGATE VALUE "1") qt_feature("gbm" @@ -802,6 +802,10 @@ qt_feature("system-png" PRIVATE ENABLE INPUT_libpng STREQUAL 'system' DISABLE INPUT_libpng STREQUAL 'qt' ) +qt_feature("imageio-text-loading" PRIVATE + LABEL "Image Text section loading" +) +qt_feature_definition("imageio-text-loading" "QT_NO_IMAGEIO_TEXT_LOADING" NEGATE) qt_feature("sessionmanager" PUBLIC SECTION "Kernel" LABEL "Session Management" diff --git a/src/gui/configure.cmake b/src/gui/configure.cmake index a4554791cf..11ffe54a85 100644 --- a/src/gui/configure.cmake +++ b/src/gui/configure.cmake @@ -647,7 +647,7 @@ qt_feature("system-freetype" PRIVATE qt_feature("fontconfig" PUBLIC PRIVATE LABEL "Fontconfig" AUTODETECT NOT APPLE - CONDITION NOT MSVC AND QT_FEATURE_system_freetype AND FONTCONFIG_FOUND + CONDITION NOT WIN32 AND QT_FEATURE_system_freetype AND FONTCONFIG_FOUND ) qt_feature_definition("fontconfig" "QT_NO_FONTCONFIG" NEGATE VALUE "1") qt_feature("gbm" diff --git a/src/gui/configure.json b/src/gui/configure.json index 2f113d56d9..5473f8b30c 100644 --- a/src/gui/configure.json +++ b/src/gui/configure.json @@ -1066,7 +1066,7 @@ "fontconfig": { "label": "Fontconfig", "autoDetect": "!config.darwin", - "condition": "!config.msvc && features.system-freetype && libs.fontconfig", + "condition": "!config.win32 && features.system-freetype && libs.fontconfig", "output": [ "privateFeature", "feature" ] }, "gbm": { |