aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAssam Boudjelthia <assam.boudjelthia@qt.io>2021-06-07 10:49:36 +0300
committerAssam Boudjelthia <assam.boudjelthia@qt.io>2021-06-15 13:20:22 +0000
commita0f6a60fb729298d4994e06efbe50f15af4cd905 (patch)
tree82780c07f471f4153a2e261a57cec57882734b8d
parentb90fef29dca7e81dc7fe44d4696d052bcf6cd7ab (diff)
Remove qtandroidextras submodule
Remove qtandroidextras from the submodules list of qt5 since it's not part of Qt 6. Task-number: QTBUG-84382 Pick-to: dev Change-Id: Ib95fa4c759c1135b7e0cde9b54ddd334a2f7d382 Reviewed-by: Simo Fält <simo.falt@qt.io>
-rw-r--r--.gitmodules10
m---------qtandroidextras0
2 files changed, 2 insertions, 8 deletions
diff --git a/.gitmodules b/.gitmodules
index 8cfbe74a..1cbc5458 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -107,7 +107,7 @@
status = ignore
[submodule "qtconnectivity"]
depends = qtbase
- recommends = qtdeclarative qtandroidextras
+ recommends = qtdeclarative
path = qtconnectivity
url = ../qtconnectivity.git
branch = 6.2
@@ -158,12 +158,6 @@
url = ../qtserialport.git
branch = 6.2
status = addon
-[submodule "qtandroidextras"]
- depends = qtbase
- path = qtandroidextras
- url = ../qtandroidextras.git
- branch = 6.2
- status = addon
[submodule "qtwebsockets"]
depends = qtbase
recommends = qtdeclarative
@@ -208,7 +202,7 @@
status = essential
[submodule "qtpurchasing"]
depends = qtbase
- recommends = qtdeclarative qtandroidextras
+ recommends = qtdeclarative
path = qtpurchasing
url = ../qtpurchasing.git
branch = 6.2
diff --git a/qtandroidextras b/qtandroidextras
deleted file mode 160000
-Subproject ab832d5597eb9a138af6b8d71dbfac86cd695f0