diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-12-12 09:46:15 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-12-12 10:55:24 +0100 |
| commit | 68472bdf4447013f6bf2c31cda8f2b717de0246c (patch) | |
| tree | ae9fc36eb973c0dda2d79ef3e1e26b007c093b1e /tools | |
| parent | 803037f9603f1fbf37179861f058248949506b0b (diff) | |
| parent | a3470904a7c07852307d72ad87129901e6a3506b (diff) | |
Merge remote-tracking branch 'origin/5.8' into dev
Conflicts:
tests/auto/render/render.pro
Change-Id: I3d0463dabae4fc78f334afc8f90d2d321ab71e03
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/qgltf/qgltf.pro | 1 | ||||
| -rw-r--r-- | tools/tools.pro | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/tools/qgltf/qgltf.pro b/tools/qgltf/qgltf.pro index a19f2e91c..df6dfa202 100644 --- a/tools/qgltf/qgltf.pro +++ b/tools/qgltf/qgltf.pro @@ -1,5 +1,4 @@ option(host_build) -!cross_compile:load(qt_build_paths) # Qt3D is free of Q_FOREACH - make sure it stays that way: DEFINES *= QT_NO_FOREACH diff --git a/tools/tools.pro b/tools/tools.pro index 055f41250..09c7d8ebf 100644 --- a/tools/tools.pro +++ b/tools/tools.pro @@ -1,3 +1,3 @@ TEMPLATE = subdirs -SUBDIRS = qgltf +!android:SUBDIRS += qgltf qgltf.CONFIG += host_build |