diff options
| author | Liang Qi <liang.qi@qt.io> | 2020-02-28 13:30:25 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2020-02-28 13:49:10 +0100 |
| commit | 08e63423e2ae3751e42f27307b290048e397dd7a (patch) | |
| tree | 93121ff564bb891990b92d09a10863ff921f4119 /.gitmodules | |
| parent | aa977addd2b6b87d702ea58e4bcf2d1e514305d3 (diff) | |
| parent | 97aa53410e3b1cc9a5a9eb2fdbf8c2be7e1ab852 (diff) | |
Merge remote-tracking branch 'origin/5.15' into dev
Conflicts:
.gitmodules
coin/platform_configs/default.yaml
coin/platform_configs/flashing-wizard.yaml
coin/platform_configs/qt5.yaml
coin/platform_configs/qtbase.yaml
coin/platform_configs/qtconnectivity.yaml
coin/platform_configs/tqtc-qt-config-gui.yaml
coin/provisioning/qtci-linux-SLES-15-x86_64/02-zypperpackages.sh
Change-Id: I7af8a52d8b4452211982d86105dafacdd3d845c0
Diffstat (limited to '.gitmodules')
| -rw-r--r-- | .gitmodules | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/.gitmodules b/.gitmodules index 470478d2..69b6de11 100644 --- a/.gitmodules +++ b/.gitmodules @@ -317,13 +317,13 @@ path = qtquicktimeline url = ../qtquicktimeline branch = dev - status = preview + status = addon [submodule "qtquick3d"] depends = qtbase qtdeclarative qtshadertools path = qtquick3d url = ../qtquick3d.git branch = dev - status = preview + status = addon [submodule "qtshadertools"] depends = qtbase path = qtshadertools |