diff options
| author | Liang Qi <liang.qi@qt.io> | 2020-04-30 17:24:22 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2020-04-30 18:35:08 +0200 |
| commit | 54c94ae681e3a2689468ce810884e5f5611b97f0 (patch) | |
| tree | 1f4e4223357b1a1d05b8e72beb99393dfbff9920 /.gitmodules | |
| parent | ff4a1141f26e66934d043d65881f1cf2aaecc788 (diff) | |
| parent | 5f03b84e6542f00cf9eccd1d8820f423cee5e2b9 (diff) | |
Merge remote-tracking branch 'origin/5.15' into dev
Conflicts:
.gitmodules
coin/platform_configs/default.yaml
coin/platform_configs/qt5.yaml
coin/platform_configs/qtbase.yaml
coin/platform_configs/qtwebkit.yaml
coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/02-apt.sh
Change-Id: If6b0f7a671a69d6a2444ee4d26b324e4d269970c
Diffstat (limited to '.gitmodules')
| -rw-r--r-- | .gitmodules | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/.gitmodules b/.gitmodules index 23a10c51..6da4e828 100644 --- a/.gitmodules +++ b/.gitmodules @@ -143,7 +143,7 @@ path = qtgraphicaleffects url = ../qtgraphicaleffects.git branch = dev - status = addon + status = essential [submodule "qtquickcontrols"] depends = qtdeclarative recommends = qtgraphicaleffects |