diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2016-08-24 19:54:10 +0200 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2016-08-24 19:54:10 +0200 |
| commit | 71524c78f60d6a5b3d4c4efc3c277bc8eae1f400 (patch) | |
| tree | d4792915f7191492ac0bf3e4b842fe530de98bf6 | |
| parent | 7efeb26af74105d53538f095ff1d1cab3f4398ee (diff) | |
| parent | b78f3579aff5032768f2c9f12b0f128e670d34d7 (diff) | |
Merge remote-tracking branch 'origin/dev' into 5.8
Note that this also contains the adjustment of the branch for the
latecomers qtspeech and qtnetworkauth.
Change-Id: Ia77eb4d47a6ad66cb35e50ae03af751f46a805a8
| -rw-r--r-- | .gitmodules | 11 | ||||
| m--------- | qtnetworkauth | 0 |
2 files changed, 9 insertions, 2 deletions
diff --git a/.gitmodules b/.gitmodules index 121c1197..fdb72689 100644 --- a/.gitmodules +++ b/.gitmodules @@ -308,5 +308,12 @@ recommends = qtdeclarative qtmultimedia path = qtspeech url = ../qtspeech - branch = dev - status = ignore + branch = 5.8 + status = preview +[submodule "qtnetworkauth"] + depends = qtbase + recommends = qtwebview + path = qtnetworkauth + url = ../qtnetworkauth + branch = 5.8 + status = preview diff --git a/qtnetworkauth b/qtnetworkauth new file mode 160000 +Subproject fba638b478e3a37e1287aa088f3aa922070c49d |