From 4c44cffd7b376900fc41169365ae03c7c65d95b6 Mon Sep 17 00:00:00 2001 From: Lars Knoll Date: Fri, 19 Aug 2016 09:07:18 +0200 Subject: Fix build after qtConfig changes in qtbase Change-Id: Ic345acc4e7cf08a0fd94c9e3a1fd2279cdd8a93e Reviewed-by: Oswald Buddenhagen --- src/svg/svg.pro | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) (limited to 'src') diff --git a/src/svg/svg.pro b/src/svg/svg.pro index ce5bf1a..f9e43b0 100644 --- a/src/svg/svg.pro +++ b/src/svg/svg.pro @@ -36,14 +36,9 @@ SOURCES += \ qgraphicssvgitem.cpp \ qsvggenerator.cpp -contains(QT_CONFIG, system-zlib) { - if(unix|mingw): LIBS_PRIVATE += -lz - else { - isEmpty(ZLIB_LIBS): LIBS += zdll.lib - else: LIBS += $$ZLIB_LIBS - } -} else { +qtConfig(system-zlib): \ + QMAKE_USE_PRIVATE += zlib +else: \ QT_PRIVATE += zlib-private -} load(qt_module) -- cgit v1.2.1