diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2015-11-10 18:46:42 +0100 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2015-12-01 17:22:49 +0000 |
| commit | e81795101cad74a70599915028045b11f2763e3a (patch) | |
| tree | 936df0e0d71d1258ad239f5e22e21c675939f3fe /src/3rdparty | |
| parent | 8e2ed90a169addd4ca4a83feb755aa493e127cf2 (diff) | |
make use of the new QtZlib module
Task-number: QTBUG-48237
Change-Id: Ie70e815c5c16ff1992218ca0414833bd75600d58
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
Diffstat (limited to 'src/3rdparty')
| -rw-r--r-- | src/3rdparty/assimp/assimp.pri | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/src/3rdparty/assimp/assimp.pri b/src/3rdparty/assimp/assimp.pri index d1bb1d457..fa5206eac 100644 --- a/src/3rdparty/assimp/assimp.pri +++ b/src/3rdparty/assimp/assimp.pri @@ -14,10 +14,7 @@ contains(QT_CONFIG, system-zlib):!if(cross_compile:host_build) { if (unix|mingw): LIBS += -lz else: LIBS += zdll.lib } else { - git_build: \ - INCLUDEPATH += $$[QT_INSTALL_HEADERS/get]/QtZlib - else: \ - INCLUDEPATH += $$[QT_INSTALL_HEADERS/src]/QtZlib + QT_PRIVATE += zlib-private } DEFINES += ASSIMP_BUILD_NO_OWN_ZLIB ASSIMP_BUILD_NO_COMPRESSED_IFC ASSIMP_BUILD_NO_Q3BSP_IMPORTER |