diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-10-12 10:36:43 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-10-12 10:43:23 +0200 |
| commit | f8bed24b631db9dd3f00ff62425e41881605382a (patch) | |
| tree | cf92ffcb0db4f51bda574fe2245e1599d1bdfe60 /.gitmodules | |
| parent | 4857e0313f85767f232c95a664e7d8669dae4c22 (diff) | |
| parent | f2fc36b021f6cb7a13543a1cd3b1f7fc6e1006af (diff) | |
Merge remote-tracking branch 'origin/5.7' into 5.7.1
Change-Id: I354a221526e9b4d1f2d3b3a4d23fa560fa72fef9
Diffstat (limited to '.gitmodules')
| -rw-r--r-- | .gitmodules | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/.gitmodules b/.gitmodules index 39fd7e78..88b68b67 100644 --- a/.gitmodules +++ b/.gitmodules @@ -263,7 +263,7 @@ branch = 5.7.1 status = addon [submodule "qtpurchasing"] - depends = qtbase + depends = qtbase qtandroidextras recommends = qtdeclarative path = qtpurchasing url = ../qtpurchasing.git |