From 912fdda4a4e817ec89c24da3238af600a4fbae9e Mon Sep 17 00:00:00 2001 From: Assam Boudjelthia Date: Mon, 7 Jun 2021 10:49:36 +0300 Subject: [PATCH] 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 --- .gitmodules | 10 ++-------- qtandroidextras | 1 - qtconnectivity | 2 +- 3 files changed, 3 insertions(+), 10 deletions(-) delete mode 160000 qtandroidextras 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 index ede82024..00000000 --- a/qtandroidextras +++ /dev/null @@ -1 +0,0 @@ -Subproject commit ede82024b08842e9599b9bdbd00b7498601a921f diff --git a/qtconnectivity b/qtconnectivity index 7d0e03a2..59cd45be 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit 7d0e03a29bfc1c5be407f4916ed4d7d1dea0c78f +Subproject commit 59cd45beb14d199ab5c5f1d0847ad1481fdf50be