diff options
| author | Lars Knoll <lars.knoll@qt.io> | 2016-08-19 09:15:07 +0200 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2016-08-19 07:22:01 +0000 |
| commit | 9c236284da151b239b41e52df894b6da61353798 (patch) | |
| tree | 5b5286fd8765bcb7ace999be3b9a2d522402fc4c | |
| parent | fd61bbad4be0b9e839f882f9681f0732d2bbce38 (diff) | |
Fix build after qtConfig changes in qtbase
Change-Id: Ic2313cf8a6e938d5885aa1e26c36a5d7d5af166d
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
| -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 |