aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLiang Qi <liang.qi@qt.io>2019-09-04 19:30:14 +0200
committerSimon Hausmann <simon.hausmann@qt.io>2019-09-04 17:52:10 +0000
commit651b050e139b316c5fd7f777a92b5095193d0617 (patch)
tree90667c3b7b1920d129cc8821059a56a9d9f70766
parentbd8feeb6b2c63d861c97efedad557572fbeaabb1 (diff)
Include qtdeclarative in wip/cmake
Change-Id: I9d23a60fbd88e30ee688532dbe5112dd3245b9a7 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
-rw-r--r--.gitmodules4
m---------qtdeclarative0
2 files changed, 2 insertions, 2 deletions
diff --git a/.gitmodules b/.gitmodules
index abd119d3..2f53378e 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -14,8 +14,8 @@
recommends = qtsvg
path = qtdeclarative
url = ../qtdeclarative.git
- branch = dev
- status = ignore
+ branch = wip/cmake
+ status = essential
[submodule "qtactiveqt"]
depends = qtbase
path = qtactiveqt
diff --git a/qtdeclarative b/qtdeclarative
-Subproject 00bcc365403f253e0c6fd54b7b1715ba974679c
+Subproject 6536c67b53db275bb51d61de3d896893101d278