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 /tools | |
| 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 'tools')
| -rw-r--r-- | tools/qgltf/qgltf.pro | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/tools/qgltf/qgltf.pro b/tools/qgltf/qgltf.pro index 66496cc8c..b6aa6f048 100644 --- a/tools/qgltf/qgltf.pro +++ b/tools/qgltf/qgltf.pro @@ -18,7 +18,6 @@ config_assimp:!cross_compile { # Extend framework search path to make #include <QtCore/*> work QMAKE_CXXFLAGS += -F$$QT.core.libs } - CONFIG += force_bootstrap include(../../src/3rdparty/assimp/assimp.pri) } |