aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAssam Boudjelthia <assam.boudjelthia@qt.io>2021-06-07 10:49:36 +0300
committerDaniel Smith <Daniel.Smith@qt.io>2021-06-28 08:11:43 +0000
commit912fdda4a4e817ec89c24da3238af600a4fbae9e (patch)
tree8012fe83f6b29bddfb1f1da13a3fd0bb473ca53b
parent53ff4f00bd28a433647af08ede051d99aba91e47 (diff)
Remove qtandroidextras submodule
Remove qtandroidextras from the submodules list of qt5 since it's not part of Qt 6. Task-number: QTBUG-84382 Change-Id: I2f9b5a576781b5d45e563dfda7830c17996685a5 Reviewed-by: Daniel Smith <Daniel.Smith@qt.io>
-rw-r--r--.gitmodules10
m---------qtandroidextras0
m---------qtconnectivity0
3 files changed, 2 insertions, 8 deletions
diff --git a/.gitmodules b/.gitmodules
index 68314f18..ee154c62 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 = dev
@@ -158,12 +158,6 @@
url = ../qtserialport.git
branch = dev
status = addon
-[submodule "qtandroidextras"]
- depends = qtbase
- path = qtandroidextras
- url = ../qtandroidextras.git
- branch = dev
- 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 = dev
diff --git a/qtandroidextras b/qtandroidextras
deleted file mode 160000
-Subproject ede82024b08842e9599b9bdbd00b7498601a921
diff --git a/qtconnectivity b/qtconnectivity
-Subproject 7d0e03a29bfc1c5be407f4916ed4d7d1dea0c78
+Subproject 59cd45beb14d199ab5c5f1d0847ad1481fdf50b