From a0f6a60fb729298d4994e06efbe50f15af4cd905 Mon Sep 17 00:00:00 2001 From: Assam Boudjelthia Date: Mon, 7 Jun 2021 10:49:36 +0300 Subject: [PATCH] Remove qtandroidextras submodule MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 --- .gitmodules | 10 ++-------- qtandroidextras | 1 - 2 files changed, 2 insertions(+), 9 deletions(-) delete mode 160000 qtandroidextras 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 index ab832d55..00000000 --- a/qtandroidextras +++ /dev/null @@ -1 +0,0 @@ -Subproject commit ab832d5597eb9a138af6b8d71dbfac86cd695f02