diff options
| author | Andy Nichols <andy.nichols@theqtcompany.com> | 2015-11-03 16:17:45 +0100 |
|---|---|---|
| committer | Andy Nichols <andy.nichols@theqtcompany.com> | 2015-11-06 19:52:18 +0000 |
| commit | 6ec968bec872dfbab98be0752cab134ba057dd19 (patch) | |
| tree | 3910c52cd91c2bd3eaabab9ad6898b4701a30c43 /tools | |
| parent | 872efa5619d20a421142a88e1a38f131c08d44d1 (diff) | |
qgltf: Do not use system-zlib for host tools
It was wrong of us to assume that a QT_CONFIG containing system-zlib
meant that we could use zlib for a host_build. There are cases where
the host does not have zlib, but the target does (cross compilation). It
also breaks the rules for host_build tools. Fortunately the bootstrap
library does provide the zlib symbols, so we just need to make sure we
include that.
Change-Id: Ibe25a22676c47909d95a83df46e311bd486fc9f7
Reviewed-by: Laszlo Agocs <laszlo.agocs@theqtcompany.com>
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/qgltf/qgltf.pro | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/tools/qgltf/qgltf.pro b/tools/qgltf/qgltf.pro index 5fcebbae5..41abfcb3f 100644 --- a/tools/qgltf/qgltf.pro +++ b/tools/qgltf/qgltf.pro @@ -1,7 +1,6 @@ option(host_build) -load(qt_tool) -SOURCES = $$PWD/qgltf.cpp +SOURCES = qgltf.cpp config_assimp:!cross_compile { !contains(QT_CONFIG, no-pkg-config) { @@ -11,5 +10,16 @@ config_assimp:!cross_compile { LIBS += -lassimp } } else { + # Fix for using bootstrap module on OSX outside of qtbase + contains(QT_CONFIG, qt_framework) { + # Add framework headers directly to make bootstrap lib work + INCLUDEPATH += $$QT.core.libs/QtCore.framework/Headers + # Extend framework search path to make #include <QtCore/*> work + QMAKE_CXXFLAGS += -F$$QT.core.libs + } + CONFIG += force_bootstrap + include(../../src/3rdparty/assimp/assimp.pri) } + +load(qt_tool) |