diff options
| author | The Qt Project <gerrit-noreply@qt-project.org> | 2019-09-24 16:50:50 +0000 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2019-09-24 16:50:50 +0000 |
| commit | dc22e0dba7d8a00bf4df61bd45116b85263c3673 (patch) | |
| tree | 87c13c09fce6c76b50c80e96fdc4a52619eec84e /.gitmodules | |
| parent | 9bc8a3e458c9fc5340ce57053501729d868d1dd8 (diff) | |
| parent | 44073f55632e7848d372a60c4417bbc8664afd2c (diff) | |
Merge "Merge remote-tracking branch 'origin/dev' into wip/cmake" into wip/cmake
Diffstat (limited to '.gitmodules')
| -rw-r--r-- | .gitmodules | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/.gitmodules b/.gitmodules index eaecbd44..4c618445 100644 --- a/.gitmodules +++ b/.gitmodules @@ -312,3 +312,15 @@ url = ../qtlottie.git branch = dev status = ignore +[submodule "qtquicktimeline"] + depends = qtbase qtdeclarative + path = qtquicktimeline + url = ../qtquicktimeline + branch = dev + status = ignore +[submodule "qtquick3d"] + depends = qtbase qtdeclarative + path = qtquick3d + url = ../qtquick3d.git + branch = dev + status = ignore |