aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIvan Solovev <ivan.solovev@qt.io>2021-10-27 12:46:05 +0200
committerQt Cherry-pick Bot <cherrypick_bot@qt-project.org>2021-11-01 21:26:09 +0000
commit409931d897ad4307c48291100af8c103d27c2ad2 (patch)
tree266a6e74bb6bf21515e18a1e268b5ebf24447aa2
parent0d35051d65c7c64266455c15a4c11e4992a749cc (diff)
Update qtlocation dependencies
This commit amends 6af22246cf3752f1d098a9e8a19617618edf65a2. qtlocation now depends on qtpositioning, but does not require qtserialport anymore. Change-Id: I1bda34020f7bc3683cf5038f2e1226d5209dfcc4 Reviewed-by: Daniel Smith <Daniel.Smith@qt.io> Reviewed-by: Edward Welbourne <edward.welbourne@qt.io> Reviewed-by: Alex Blasche <alexander.blasche@qt.io> (cherry picked from commit 70a8080f54043a345d0225707821c2002b6a7078) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
-rw-r--r--.gitmodules4
1 files changed, 2 insertions, 2 deletions
diff --git a/.gitmodules b/.gitmodules
index 99e36edf..523bf897 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -72,8 +72,8 @@
status = essential
priority = 50
[submodule "qtlocation"]
- depends = qtbase
- recommends = qtdeclarative qtserialport
+ depends = qtbase qtpositioning
+ recommends = qtdeclarative
path = qtlocation
url = ../qtlocation.git
branch = 6.2