diff options
| author | Ivan Solovev <ivan.solovev@qt.io> | 2021-10-19 19:15:52 +0200 |
|---|---|---|
| committer | Ivan Solovev <ivan.solovev@qt.io> | 2021-10-26 09:54:56 +0200 |
| commit | eb874192c95bfed04b26d3021060b4adbe6c42b4 (patch) | |
| tree | 33c3b7f48c1a6b584123b1de9c9d644a77189603 | |
| parent | e3a457f60d646d9c09fa8e80fd92ac1d04490e45 (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
Change-Id: I7adb9fc405119f865cd6b25a6ce9eff40d693b14
Reviewed-by: Daniel Smith <Daniel.Smith@qt.io>
(cherry picked from commit 6af22246cf3752f1d098a9e8a19617618edf65a2)
| -rw-r--r-- | .gitmodules | 9 | ||||
| m--------- | qtpositioning | 0 |
2 files changed, 8 insertions, 1 deletions
diff --git a/.gitmodules b/.gitmodules index 24414158..99e36edf 100644 --- a/.gitmodules +++ b/.gitmodules @@ -77,6 +77,13 @@ path = qtlocation url = ../qtlocation.git branch = 6.2 + status = ignore +[submodule "qtpositioning"] + depends = qtbase + recommends = qtdeclarative qtserialport + path = qtpositioning + url = ../qtpositioning.git + branch = 6.2 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 = 6.2 diff --git a/qtpositioning b/qtpositioning new file mode 160000 +Subproject c3b1059d8532640c8586199ff314f964dbe6277 |