diff options
| author | Liang Qi <liang.qi@qt.io> | 2018-04-10 15:04:06 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2018-04-10 15:04:06 +0200 |
| commit | 9b584a8117b9ef6d4d40eb5042c5ee4df18b2fed (patch) | |
| tree | 934b13767005c532c635b3d1c04c5993c4921d7e /.gitmodules | |
| parent | 5abe434755b89e7a52d7b64a870cbd4d312700de (diff) | |
| parent | 1616d89eeaae1bb8d708f5ebd9eadc5c6f86660d (diff) | |
Merge remote-tracking branch 'origin/5.11' into dev
Change-Id: I63778fc883354b724fcf91d92ee6d80b7cb481aa
Diffstat (limited to '.gitmodules')
| -rw-r--r-- | .gitmodules | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/.gitmodules b/.gitmodules index f1a6f8e8..26c3e3d8 100644 --- a/.gitmodules +++ b/.gitmodules @@ -249,8 +249,8 @@ branch = dev status = essential [submodule "qtpurchasing"] - depends = qtbase qtandroidextras - recommends = qtdeclarative + depends = qtbase + recommends = qtdeclarative qtandroidextras path = qtpurchasing url = ../qtpurchasing.git branch = dev |