diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-03-28 10:20:15 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-03-28 10:20:15 +0200 |
| commit | 37e3da674c3b2deae8eb4be923d3ad46842fd4ca (patch) | |
| tree | 92648031b598cb9e709a9fd303ec617e38ee32a6 /.gitmodules | |
| parent | 1da7bdd25e5ec8d8b602ed54ef468355e0beedeb (diff) | |
| parent | bee0c1b12f7e76f6ef1a0756f67d60a400838fd4 (diff) | |
Merge remote-tracking branch 'origin/5.9' into dev
Change-Id: I370742cb0aa2b362dded7131adb08bc7af44a02b
Diffstat (limited to '.gitmodules')
| -rw-r--r-- | .gitmodules | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/.gitmodules b/.gitmodules index 9fbe0308..16393b28 100644 --- a/.gitmodules +++ b/.gitmodules @@ -93,7 +93,7 @@ priority = 50 [submodule "qtlocation"] depends = qtbase - recommends = qtdeclarative qtquickcontrols qtserialport + recommends = qtdeclarative qtquickcontrols qtquickcontrols2 qtserialport path = qtlocation url = ../qtlocation.git branch = dev |