From 8e2ed90a169addd4ca4a83feb755aa493e127cf2 Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Mon, 23 Nov 2015 20:39:22 +0100 Subject: fix condition for using qtcore's built-in zlib when we're not cross-building, even a host build may use the system zlib. this also makes the force_bootstrap workaround in qgltf superfluous. Change-Id: Ic0a8b872ac602b1f268a1c6f8dcd5b400d641ff5 Reviewed-by: Joerg Bornemann Reviewed-by: Oswald Buddenhagen --- src/3rdparty/assimp/assimp.pri | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/3rdparty') diff --git a/src/3rdparty/assimp/assimp.pri b/src/3rdparty/assimp/assimp.pri index fb607815b..d1bb1d457 100644 --- a/src/3rdparty/assimp/assimp.pri +++ b/src/3rdparty/assimp/assimp.pri @@ -10,7 +10,7 @@ CONFIG -= precompile_header win32:DEFINES+=_CRT_SECURE_NO_WARNINGS -!host_build:contains(QT_CONFIG, system-zlib) { +contains(QT_CONFIG, system-zlib):!if(cross_compile:host_build) { if (unix|mingw): LIBS += -lz else: LIBS += zdll.lib } else { -- cgit v1.2.3