summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSimon Hausmann <simon.hausmann@theqtcompany.com>2016-09-28 16:40:47 +0200
committerSimon Hausmann <simon.hausmann@theqtcompany.com>2016-09-28 16:41:56 +0200
commit6fabd3496096b7a3b268f4b62f30395a5dcd3305 (patch)
treec1bd7b0bcb7420c285601924f8644ddd8a17cba2
parent657cab9312005308ee5204afd871325b4369af08 (diff)
parent5ee2290c0c9d21230c46ba19f44e0a1f1ec772bf (diff)
Merge remote-tracking branch 'origin/5.6' into 5.7
-rw-r--r--.gitmodules2
1 files changed, 1 insertions, 1 deletions
diff --git a/.gitmodules b/.gitmodules
index 1f3780f1..b24ddfc7 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -263,7 +263,7 @@
branch = 5.7
status = addon
[submodule "qtpurchasing"]
- depends = qtbase
+ depends = qtbase qtandroidextras
recommends = qtdeclarative
path = qtpurchasing
url = ../qtpurchasing.git