Commit d0cadf5b authored by Thibaut ROMAIN's avatar Thibaut ROMAIN
Browse files

BUG: Fix patches for windows and Mac OS

parent ae8f08b0
Pipeline #8534 failed with stages
in 108 minutes and 3 seconds
--- qt-everywhere-src-5.10.1/qtbase/src/gui/configure.json 2018-02-08 19:24:48.000000000 +0100
+++ QT5/qtbase/src/gui/configure.json 2018-04-10 11:50:15.631526687 +0200
@@ -278,8 +278,7 @@
"main": "jpeg_create_compress(cinfo);"
},
"sources": [
@@ -374,7 +374,5 @@
"headers": "jpeglib.h",
"sources": [
{ "type": "pkgConfig", "args": "libjpeg" },
- { "libs": "-llibjpeg", "condition": "config.msvc" },
- { "libs": "-ljpeg", "condition": "!config.msvc" }
- "-ljpeg"
+ { "libs": "-ljpeg" }
]
},
"libpng": {
]
},
\ No newline at end of file
......@@ -10,7 +10,7 @@
{ "libs": "-s USE_FREETYPE=1", "condition": "config.wasm" },
{ "libs": "-lfreetype" }
],
@@ -397,12 +397,12 @@
@@ -397,11 +397,11 @@
"headers": "png.h",
"sources": [
- { "type": "pkgConfig", "args": "libpng" },
......@@ -23,4 +23,4 @@
{ "libs": "-s USE_LIBPNG=1", "condition": "config.wasm" }
],
"use": [
{ "lib": "zlib", "condition": "features.system-zlib" }
{ "lib": "zlib", "condition": "features.system-zlib" }
\ No newline at end of file
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