diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@qt.io> | 2017-05-04 14:03:03 +0200 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@qt.io> | 2017-05-04 14:03:03 +0200 |
| commit | 67dea992954a4499d81ee63457263f913ca92c50 (patch) | |
| tree | 352e5879cd0bd50f3fe27117530ea1f601b97079 /tools | |
| parent | ba2974a8abdf0048d2c8ecc821d369c74598e39f (diff) | |
| parent | d947ef04bc162d9f1816afb6188e8ef0a30c5143 (diff) | |
Merge 5.9 into 5.9.0
Change-Id: I02adbc5294f9d5879cb05e75eccad74196ea2a7c
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/tools.pro | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/tools/tools.pro b/tools/tools.pro index 9c384630e..8e973aecb 100644 --- a/tools/tools.pro +++ b/tools/tools.pro @@ -1,2 +1,4 @@ TEMPLATE = subdirs -!android:SUBDIRS += qgltf +QT_FOR_CONFIG += 3dcore-private +!android:qtConfig(assimp):qtConfig(commandlineparser): \ + SUBDIRS += qgltf |