diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-09-30 16:13:52 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-09-30 16:13:52 +0200 |
| commit | 0e4688d36ea143b285e2ecf96073c83142bdfe41 (patch) | |
| tree | ffbf520c764e4942af7569b1341bf86ad56d16ee /.gitmodules | |
| parent | 2fb27862aa760d88790b23e0eab3cd3be5341054 (diff) | |
| parent | a5b6125466344f0f9b73691b97fbc809c5ad9f7f (diff) | |
Merge remote-tracking branch 'origin/5.8' into dev
Conflicts:
.gitmodules
Change-Id: I6f517c976152f2da390c556c7c9da08aaec4be90
Diffstat (limited to '.gitmodules')
| -rw-r--r-- | .gitmodules | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/.gitmodules b/.gitmodules index f9e798cc..79aca023 100644 --- a/.gitmodules +++ b/.gitmodules @@ -93,7 +93,7 @@ priority = 50 [submodule "qtlocation"] depends = qtbase - recommends = qtdeclarative qtquickcontrols qtserialport qtsystems + recommends = qtdeclarative qtquickcontrols qtserialport path = qtlocation url = ../qtlocation.git branch = dev @@ -183,7 +183,7 @@ path = qtserialbus url = ../qtserialbus.git branch = dev - status = preview + status = addon [submodule "qtserialport"] depends = qtbase path = qtserialport @@ -263,7 +263,7 @@ branch = dev status = addon [submodule "qtpurchasing"] - depends = qtbase + depends = qtbase qtandroidextras recommends = qtdeclarative path = qtpurchasing url = ../qtpurchasing.git @@ -302,7 +302,7 @@ path = qtscxml url = ../qtscxml branch = dev - status = preview + status = addon [submodule "qtspeech"] depends = qtbase recommends = qtdeclarative qtmultimedia |