diff options
| author | Liang Qi <liang.qi@qt.io> | 2020-04-24 22:34:43 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2020-04-24 22:34:43 +0200 |
| commit | 305055926211d20bdbc407e8ce35440e061aef97 (patch) | |
| tree | fac1450697b9b3c5b3f0cbddb7eee8d5d8df4928 /.gitmodules | |
| parent | 767711b44a4c6cf6719db81753b7c800ad3da51d (diff) | |
| parent | 5b018f96af70639c0df261be425b988388bb85a1 (diff) | |
Merge remote-tracking branch 'origin/5.15' into 5.15.0
Conflicts:
.gitmodules
Change-Id: I72e0314fbc563a2386f2389239b927f57124c511
Diffstat (limited to '.gitmodules')
| -rw-r--r-- | .gitmodules | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/.gitmodules b/.gitmodules index 1b02e9ac..f9c11a36 100644 --- a/.gitmodules +++ b/.gitmodules @@ -150,7 +150,7 @@ path = qtgraphicaleffects url = ../qtgraphicaleffects.git branch = 5.15.0 - status = addon + status = essential [submodule "qtquickcontrols"] depends = qtdeclarative recommends = qtgraphicaleffects |