diff options
| author | Liang Qi <liang.qi@qt.io> | 2018-02-21 11:28:57 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2018-02-21 11:29:36 +0100 |
| commit | 05185633763b9916331be868f33a36018dcf2b4b (patch) | |
| tree | 96bbdcf3dfb5627e003ce1c8d9fc3297193abb3b /tests/auto/auto.pro | |
| parent | 0fd16cf43fc94344ab7944379f3dd9645156a4fd (diff) | |
| parent | c40c7ac6b57603ecb992f666ce7435110bb3e587 (diff) | |
Merge remote-tracking branch 'origin/5.9' into 5.11
Conflicts:
src/render/backend/renderer.cpp
tests/auto/auto.pro
Change-Id: Idc5bb088ae7f591809f8795124a3e44410bf4cf9
Diffstat (limited to 'tests/auto/auto.pro')
| -rw-r--r-- | tests/auto/auto.pro | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/tests/auto/auto.pro b/tests/auto/auto.pro index 2d7ec9cb3..6bb3597ea 100644 --- a/tests/auto/auto.pro +++ b/tests/auto/auto.pro @@ -12,7 +12,10 @@ qtConfig(qt3d-render): SUBDIRS += render qtConfig(qt3d-input): SUBDIRS += input qtConfig(qt3d-animation): SUBDIRS += animation qtConfig(qt3d-extras): SUBDIRS += extras -qtConfig(qt3d-render):qtConfig(qt3d-input): SUBDIRS += quick3d +qtConfig(qt3d-render) { + SUBDIRS += geometryloaders + qtConfig(qt3d-input): SUBDIRS += quick3d +} for(subdir, SUBDIRS) { !equals(subdir, coretest) { |