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

Prospective fix for trying to build FontConfig on Windows

Browse Source 
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>
This commit is contained in:
Friedemann Kleint 2020-06-22 14:35:25 +02:00
parent ffb73175e6
commit 04b120bc3c
3 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/gui/.prev_configure.cmake
View File

@ -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"

2
src/gui/configure.cmake
View File

@ -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"

2
src/gui/configure.json
View File

@ -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": {