diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-08-20 17:22:08 +0200 |
|---|---|---|
| committer | Lars Knoll <lars.knoll@qt.io> | 2016-08-21 19:59:33 +0000 |
| commit | 47f3704afc59d0dba0f5d2c8626cfdb443436b19 (patch) | |
| tree | fc10d2808b718cf05711b9269d52042b8bb9015a /src/3rdparty | |
| parent | 9a18925b63d47a20d7b74cfd508d7ae71f2d4d7c (diff) | |
Adjust to qtConfig() changes in qtbase
Change-Id: Ic5b9447ef9ba54124553775b973d616af22b7032
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Diffstat (limited to 'src/3rdparty')
| -rw-r--r-- | src/3rdparty/assimp/assimp.pri | 8 | ||||
| -rw-r--r-- | src/3rdparty/assimp/assimp_dependency.pri | 2 |
2 files changed, 4 insertions, 6 deletions
diff --git a/src/3rdparty/assimp/assimp.pri b/src/3rdparty/assimp/assimp.pri index ad72816d8..d3282fb56 100644 --- a/src/3rdparty/assimp/assimp.pri +++ b/src/3rdparty/assimp/assimp.pri @@ -10,12 +10,10 @@ CONFIG -= precompile_header win32:DEFINES+=_CRT_SECURE_NO_WARNINGS -contains(QT_CONFIG, system-zlib):!if(cross_compile:host_build) { - if (unix|mingw): LIBS += -lz - else: LIBS += zdll.lib -} else { +qtConfig(system-zlib):!if(cross_compile:host_build): \ + QMAKE_USE_PRIVATE += zlib +else: \ QT_PRIVATE += zlib-private -} DEFINES += ASSIMP_BUILD_NO_OWN_ZLIB ASSIMP_BUILD_NO_COMPRESSED_IFC ASSIMP_BUILD_NO_Q3BSP_IMPORTER diff --git a/src/3rdparty/assimp/assimp_dependency.pri b/src/3rdparty/assimp/assimp_dependency.pri index 4fe0df54e..f1a109f10 100644 --- a/src/3rdparty/assimp/assimp_dependency.pri +++ b/src/3rdparty/assimp/assimp_dependency.pri @@ -1,5 +1,5 @@ config_assimp:!if(cross_compile:host_build) { - unix:!contains(QT_CONFIG, no-pkg-config) { + unix:qtConfig(pkg-config) { CONFIG += link_pkgconfig PKGCONFIG_PRIVATE += assimp } else { |