diff options
| author | Liang Qi <liang.qi@qt.io> | 2019-08-26 15:59:56 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2019-08-26 18:31:59 +0200 |
| commit | 6f3f8913d87bf572b72e891c008110976af80ef1 (patch) | |
| tree | 5edb17514f97a47d3cb4d2fcc762fe4590e059ba /.gitmodules | |
| parent | 3631a12b842bec017a49e4a5a41b0ee16e8b7376 (diff) | |
| parent | ff75bd52975918eef5711826356143e9e8a90180 (diff) | |
Merge remote-tracking branch 'origin/dev' into 5.14
Conflicts:
.gitmodules
Change-Id: Idd7160b4c1aeb43a2c9580e93627eae118b742a3
Diffstat (limited to '.gitmodules')
| -rw-r--r-- | .gitmodules | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/.gitmodules b/.gitmodules index f657b96c..f6948954 100644 --- a/.gitmodules +++ b/.gitmodules @@ -318,3 +318,9 @@ url = ../qtquicktimeline branch = 5.14 status = preview +[submodule "qtquick3d"] + depends = qtbase qtdeclarative + path = qtquick3d + url = ../qtquick3d.git + branch = 5.14 + status = preview |