diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2015-11-23 20:39:22 +0100 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2015-12-01 17:22:44 +0000 |
| commit | 8e2ed90a169addd4ca4a83feb755aa493e127cf2 (patch) | |
| tree | d3ec7490dbb2c71e93efd4b24adb17ed106817d0 /src/3rdparty | |
| parent | 85d2a1096f6e67dfbb2075a3ad0e60eaf6e6bf09 (diff) | |
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 <joerg.bornemann@theqtcompany.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
Diffstat (limited to 'src/3rdparty')
| -rw-r--r-- | src/3rdparty/assimp/assimp.pri | 2 |
1 files changed, 1 insertions, 1 deletions
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 { |