diff options
author | Liang Qi <liang.qi@qt.io> | 2019-08-02 12:14:55 +0200 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2019-08-03 00:02:43 +0200 |
commit | a94696ccd5be936099809eda58db02999cb7c77a (patch) | |
tree | d8405a9848a24535aa86951305bdef035e4a7cc8 /.gitmodules | |
parent | 4c5d3f2e43008da3e7e96e7cbed31bc3bbf6cfab (diff) | |
parent | 125c5e6528abee7796f6e5b68526bc050bd9250e (diff) |
Merge remote-tracking branch 'origin/5.12' into 5.13
Conflicts:
.gitmodules
ignore QtWebEngine on QEMU temporarily.
coin/platform_configs/default.yaml
no-gui build was removed temporarily.
coin/platform_configs/qt5.yaml
coin/platform_configs/qtbase.yaml
coin/platform_configs/qtconnectivity.yaml
coin/platform_configs/qtsaferenderer.yaml
Task-number: QTQAINFRA-2576
Task-number: QTBUG-77304
Task-number: QTBUG-77305
Done-With: Tony Sarajärvi <tony.sarajarvi@qt.io>
Change-Id: If7cf75791677eace762374b92382a2ce15f17f55
Diffstat (limited to '.gitmodules')
-rw-r--r-- | .gitmodules | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/.gitmodules b/.gitmodules index 2f6addc7..c6e10304 100644 --- a/.gitmodules +++ b/.gitmodules @@ -216,7 +216,7 @@ path = qtwebengine url = ../qtwebengine.git branch = 5.13 - status = addon + status = ignore priority = 10 [submodule "qtcanvas3d"] depends = qtdeclarative @@ -265,7 +265,7 @@ path = qtvirtualkeyboard url = ../qtvirtualkeyboard.git branch = 5.13 - status = addon + status = ignore [submodule "qtgamepad"] depends = qtbase recommends = qtdeclarative |