diff options
| author | Laszlo Agocs <laszlo.agocs@theqtcompany.com> | 2015-08-17 13:50:47 +0200 |
|---|---|---|
| committer | Laszlo Agocs <laszlo.agocs@theqtcompany.com> | 2015-08-18 11:30:30 +0000 |
| commit | cc17811995b382280a65a30fdd93bc92c5c01478 (patch) | |
| tree | f4e041b409020f0b4536517c1c9eeaffa2e51d1c | |
| parent | ff6eb8b14dd6754c1db6b444d7012601ad6e45ce (diff) | |
Rename tools directory back
And remove force_bootstrap that breaks non-cross-compiled
builds.
In true cross-compiled builds cross_compile (that is set
during configure) will trigger force_bootstrap so we don't
have to set that manually for tools outside qtbase.
Change-Id: Ie3bc6fc105ea7686a3098c6afd631561755aa01b
Reviewed-by: Andy Nichols <andy.nichols@theqtcompany.com>
| -rw-r--r-- | tools/qgltf/qgltf.cpp (renamed from 3dtools/qgltf/qgltf.cpp) | 0 | ||||
| -rw-r--r-- | tools/qgltf/qgltf.prf (renamed from 3dtools/qgltf/qgltf.prf) | 0 | ||||
| -rw-r--r-- | tools/qgltf/qgltf.pro (renamed from 3dtools/qgltf/qgltf.pro) | 1 | ||||
| -rw-r--r-- | tools/tools.pro (renamed from 3dtools/tools.pro) | 1 |
4 files changed, 1 insertions, 1 deletions
diff --git a/3dtools/qgltf/qgltf.cpp b/tools/qgltf/qgltf.cpp index a62ce7d6b..a62ce7d6b 100644 --- a/3dtools/qgltf/qgltf.cpp +++ b/tools/qgltf/qgltf.cpp diff --git a/3dtools/qgltf/qgltf.prf b/tools/qgltf/qgltf.prf index 7b4c590fb..7b4c590fb 100644 --- a/3dtools/qgltf/qgltf.prf +++ b/tools/qgltf/qgltf.prf diff --git a/3dtools/qgltf/qgltf.pro b/tools/qgltf/qgltf.pro index 4cd959b21..8f68bb509 100644 --- a/3dtools/qgltf/qgltf.pro +++ b/tools/qgltf/qgltf.pro @@ -1,5 +1,4 @@ option(host_build) -CONFIG += force_bootstrap SOURCES = $$PWD/qgltf.cpp diff --git a/3dtools/tools.pro b/tools/tools.pro index 19ec8fb45..055f41250 100644 --- a/3dtools/tools.pro +++ b/tools/tools.pro @@ -1,2 +1,3 @@ TEMPLATE = subdirs SUBDIRS = qgltf +qgltf.CONFIG += host_build |