aboutsummaryrefslogtreecommitdiffstats
path: root/.gitmodules
diff options
context:
space:
mode:
authorSimon Hausmann <simon.hausmann@qt.io>2019-09-06 15:30:46 +0200
committerSimon Hausmann <simon.hausmann@qt.io>2019-09-06 13:32:03 +0000
commit016016b64ead5882cb39e23d99832344083f5cf7 (patch)
tree6713e1b0ceeb10c5ff74b5f60f0e4fdb30a07edb /.gitmodules
parent01b083ca8e098001b5808a56a409bf37edb49036 (diff)
Really add qttools to the build
... and not qtscript accidentally, like in the previous change. Change-Id: Ic8cd85ef7b149ffee7bc85ffa3fc9075f8a77c1b Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Diffstat (limited to '.gitmodules')
-rw-r--r--.gitmodules4
1 files changed, 2 insertions, 2 deletions
diff --git a/.gitmodules b/.gitmodules
index 640f73ff..7f30091a 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -41,8 +41,8 @@
recommends = qtdeclarative qtactiveqt
path = qttools
url = ../qttools.git
- branch = dev
- status = ignore
+ branch = wip/cmake
+ status = essential
[submodule "qtxmlpatterns"]
depends = qtbase
recommends = qtdeclarative