diff options
Diffstat (limited to 'qt5-use-system-zlib-in-host-libs.patch')
| -rw-r--r-- | qt5-use-system-zlib-in-host-libs.patch | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/qt5-use-system-zlib-in-host-libs.patch b/qt5-use-system-zlib-in-host-libs.patch index a5046514062a..311e5a981d44 100644 --- a/qt5-use-system-zlib-in-host-libs.patch +++ b/qt5-use-system-zlib-in-host-libs.patch @@ -1,11 +1,11 @@ ---- a/src/tools/bootstrap/bootstrap.pro 2014-01-01 13:22:42.367935800 -0600 -+++ b/src/tools/bootstrap/bootstrap.pro 2014-01-02 23:38:20.707687700 -0600 -@@ -145,7 +145,7 @@ +--- src/tools/bootstrap/bootstrap.pro.orig 2016-06-14 17:01:24.972134372 +0200 ++++ src/tools/bootstrap/bootstrap.pro 2016-05-25 17:46:17.000000000 +0200 +@@ -132,7 +132,7 @@ ../../corelib/io/qstandardpaths_win.cpp } --if(contains(QT_CONFIG, zlib)|cross_compile):include(../../3rdparty/zlib.pri) -+if(contains(QT_CONFIG, zlib)):include(../../3rdparty/zlib.pri) - else:include(../../3rdparty/zlib_dependency.pri) - - win32:LIBS += -luser32 -lole32 -ladvapi32 -lshell32 +-contains(QT_CONFIG, zlib)|cross_compile { ++contains(QT_CONFIG, zlib) { + include(../../3rdparty/zlib.pri) + } else { + CONFIG += no_core_dep |