From e81795101cad74a70599915028045b11f2763e3a Mon Sep 17 00:00:00 2001
From: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
Date: Tue, 10 Nov 2015 18:46:42 +0100
Subject: make use of the new QtZlib module

Task-number: QTBUG-48237
Change-Id: Ie70e815c5c16ff1992218ca0414833bd75600d58
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
---
 src/3rdparty/assimp/assimp.pri | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

(limited to 'src/3rdparty/assimp')

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
-- 
cgit v1.2.1