aboutsummaryrefslogtreecommitdiffstats
path: root/.gitmodules
diff options
context:
space:
mode:
authorIvan Solovev <ivan.solovev@qt.io>2021-10-19 19:15:52 +0200
committerIvan Solovev <ivan.solovev@qt.io>2021-10-21 11:16:20 +0200
commit6af22246cf3752f1d098a9e8a19617618edf65a2 (patch)
treecf14f1b000323c02e6397bc9ff71d0298adb16ad /.gitmodules
parent308584fbfdd11003932dea6c162a944b7b2ac81a (diff)
Add qtpositioning as a submodule
The new qtpositionig repo is created to split QtLocation and QtPositioning development. This patch adds the new repo as a submodule to qt5.git It also marks the qtlocation module as ignored and removes it from dependencies, using qtpositioning instead. Task-number: QTBUG-97188 Pick-to: 6.2 Change-Id: I7adb9fc405119f865cd6b25a6ce9eff40d693b14 Reviewed-by: Daniel Smith <Daniel.Smith@qt.io>
Diffstat (limited to '.gitmodules')
-rw-r--r--.gitmodules9
1 files changed, 8 insertions, 1 deletions
diff --git a/.gitmodules b/.gitmodules
index 634efa18..84dedb0b 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -77,6 +77,13 @@
path = qtlocation
url = ../qtlocation.git
branch = dev
+ status = ignore
+[submodule "qtpositioning"]
+ depends = qtbase
+ recommends = qtdeclarative qtserialport
+ path = qtpositioning
+ url = ../qtpositioning.git
+ branch = dev
status = addon
[submodule "qtsensors"]
depends = qtbase
@@ -161,7 +168,7 @@
status = addon
[submodule "qtwebengine"]
depends = qtdeclarative
- recommends = qtlocation qtwebchannel qttools
+ recommends = qtwebchannel qttools qtpositioning
path = qtwebengine
url = ../qtwebengine.git
branch = dev