Commit c834ef03 authored by Cédric Traizet's avatar Cédric Traizet

BUG: patch for png and freetype detection

parent 87e74857
diff -burN qt-everywhere-src-5.14.1_orig/qtbase/src/gui/configure.json qt-everywhere-src-5.14.1/qtbase/src/gui/configure.json--- qt-everywhere-src-5.14.1_orig/qtbase/src/gui/configure.json 2020-07-27 18:13:35.779000908 +0200
+++ qt-everywhere-src-5.14.1/qtbase/src/gui/configure.json 2020-07-27 18:18:11.226987484 +0200
@@ -239,10 +239,10 @@
},
"headers": "ft2build.h",
"sources": [
- { "type": "pkgConfig", "args": "freetype2" },
{ "type": "freetype", "libs": "-lfreetype", "condition": "!config.wasm" },
{ "libs": "-s USE_FREETYPE=1", "condition": "config.wasm" },
- { "libs": "-lfreetype" }
+ { "libs": "-lfreetype" },
+ { "type": "pkgConfig", "args": "freetype2" }
],
"use": [
{ "lib": "zlib", "condition": "features.system-zlib" }
@@ -397,12 +397,12 @@
},
"headers": "png.h",
"sources": [
- { "type": "pkgConfig", "args": "libpng" },
{ "libs": "-llibpng16", "condition": "config.msvc" },
{ "libs": "-llibpng", "condition": "config.msvc" },
{ "libs": "-lpng16", "condition": "!config.msvc" },
{ "libs": "-lpng", "condition": "!config.msvc" },
- { "libs": "-s USE_LIBPNG=1", "condition": "config.wasm" }
+ { "libs": "-s USE_LIBPNG=1", "condition": "config.wasm" },
+ { "type": "pkgConfig", "args": "libpng" }
],
"use": [
{ "lib": "zlib", "condition": "features.system-zlib" }
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment