summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHarald Vistnes <harald.vistnes@gmail.com>2017-08-01 23:24:12 +0200
committerTony Sarajärvi <tony.sarajarvi@qt.io>2017-08-02 05:30:16 +0000
commit830f8ac7f2d575cf2d3cdbcbf9bb86cc56a7d67e (patch)
tree28b814ab3777895bae4a18dea9a44d66914b0c05
parent36d7e7a8da5053cdf77c95eba1da896f09ee0294 (diff)
Make Qt3D depend on qtbase and optionally on qtdeclarative
This change will make the pure C++ libs of Qt3D be built even if qtdeclarative is skipped. Task-number: QTBUG-62256 Change-Id: I0cdf19a57d1d8eca065e19a21e88193c5dcb5eb6 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
-rw-r--r--.gitmodules4
1 files changed, 2 insertions, 2 deletions
diff --git a/.gitmodules b/.gitmodules
index 145fac4f..9ea5c3b2 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -146,8 +146,8 @@
branch = 5.9
status = addon
[submodule "qt3d"]
- depends = qtdeclarative
- recommends = qtimageformats qtgamepad
+ depends = qtbase
+ recommends = qtdeclarative qtimageformats qtgamepad
path = qt3d
url = ../qt3d.git
branch = 5.9