diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-11-16 13:25:37 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-11-16 13:25:37 +0100 |
| commit | 6e66de74515fb17bd54e0cccdb9a35d04f84066f (patch) | |
| tree | 2624f0188aa85798442dba798460439b85dbba9a | |
| parent | 4fc0088ef6f99e8c093991614bd9848e8cf16e9b (diff) | |
| parent | a07e45b86f22ea2d97310bebaeb82339bfda84a1 (diff) | |
| download | qt3d-6e66de74515fb17bd54e0cccdb9a35d04f84066f.tar.gz | |
Merge remote-tracking branch 'origin/5.11' into 5.12
Conflicts:
.qmake.conf
Change-Id: Id9365d9acd2d5227cca5c7d025618f37e374d275
| -rw-r--r-- | tools/tools.pro | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/tools.pro b/tools/tools.pro index c2f692034..121507613 100644 --- a/tools/tools.pro +++ b/tools/tools.pro @@ -1,5 +1,5 @@ TEMPLATE = subdirs QT_FOR_CONFIG += 3dcore-private -qtConfig(assimp):qtConfig(commandlineparser):!cross_compile: { +qtConfig(assimp):qtConfig(commandlineparser): { SUBDIRS += qgltf } |