From 6af22246cf3752f1d098a9e8a19617618edf65a2 Mon Sep 17 00:00:00 2001 From: Ivan Solovev Date: Tue, 19 Oct 2021 19:15:52 +0200 Subject: [PATCH] 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 --- .gitmodules | 9 ++++++++- qtpositioning | 1 + 2 files changed, 9 insertions(+), 1 deletion(-) create mode 160000 qtpositioning 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 diff --git a/qtpositioning b/qtpositioning new file mode 160000 index 00000000..7f6ee8fa --- /dev/null +++ b/qtpositioning @@ -0,0 +1 @@ +Subproject commit 7f6ee8fa23a92660c4728b950bb14a46d1ec6a5b