diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-09-30 09:27:59 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-09-30 09:27:59 +0200 |
| commit | a5b6125466344f0f9b73691b97fbc809c5ad9f7f (patch) | |
| tree | 67b3c035a279951862d53339cd55724d7d59ab73 /.gitmodules | |
| parent | 1148171a5d1e481a19c1bb4f11d6316fbeb5286c (diff) | |
| parent | 6fabd3496096b7a3b268f4b62f30395a5dcd3305 (diff) | |
Merge remote-tracking branch 'origin/5.7' into 5.8
Change-Id: I4060b0ddeb5a77c40b31e1ce1dafd2e878b48e12
Diffstat (limited to '.gitmodules')
| -rw-r--r-- | .gitmodules | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/.gitmodules b/.gitmodules index 1e4cc51b..f044480c 100644 --- a/.gitmodules +++ b/.gitmodules @@ -263,7 +263,7 @@ branch = 5.8 status = addon [submodule "qtpurchasing"] - depends = qtbase + depends = qtbase qtandroidextras recommends = qtdeclarative path = qtpurchasing url = ../qtpurchasing.git |