diff options
-rw-r--r-- | src/3rdparty/zlib_dependency.pri | 8 | ||||
-rw-r--r-- | tests/benchmarks/benchmarks.pro | 2 |
2 files changed, 3 insertions, 7 deletions
diff --git a/src/3rdparty/zlib_dependency.pri b/src/3rdparty/zlib_dependency.pri index 5cccf37..2c714b3 100644 --- a/src/3rdparty/zlib_dependency.pri +++ b/src/3rdparty/zlib_dependency.pri @@ -1,10 +1,6 @@ # zlib dependency satisfied by bundled 3rd party zlib or system zlib -contains(QT_CONFIG, system-zlib) { - unix|mingw: LIBS_PRIVATE += -lz - else { - isEmpty(ZLIB_LIBS): LIBS += zdll.lib - else: LIBS += $$ZLIB_LIBS - } +qtConfig(system-zlib) { + QMAKE_USE_PRIVATE += zlib } else { QT_PRIVATE += zlib-private } diff --git a/tests/benchmarks/benchmarks.pro b/tests/benchmarks/benchmarks.pro index 793221c..3565a63 100644 --- a/tests/benchmarks/benchmarks.pro +++ b/tests/benchmarks/benchmarks.pro @@ -1,3 +1,3 @@ TEMPLATE = subdirs SUBDIRS = -contains(QT_CONFIG, system-zlib): SUBDIRS += mng tiff +qtConfig(system-zlib): SUBDIRS += mng tiff |