From 66ce587c4693fcae28bcf8dcee4a13be1abc3710 Mon Sep 17 00:00:00 2001 From: Jani Heikkinen Date: Tue, 18 May 2021 14:43:06 +0300 Subject: [PATCH] Restore qtwebchannel as a addon in qt5.git According to plan Qt Webchannel will be back in Qt 6.2 so let's add it in official builds Task-number: QTBUG-93212 Change-Id: Iea137a18d8c635210ee56e2ebfa1f485b4a791a8 Reviewed-by: Allan Sandfeld Jensen --- .gitmodules | 2 +- qtwebchannel | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitmodules b/.gitmodules index 32be037a..e033b350 100644 --- a/.gitmodules +++ b/.gitmodules @@ -184,7 +184,7 @@ path = qtwebchannel url = ../qtwebchannel.git branch = dev - status = ignore + status = addon [submodule "qtwebengine"] depends = qtdeclarative recommends = qtquickcontrols qtquickcontrols2 qtlocation qtwebchannel qttools diff --git a/qtwebchannel b/qtwebchannel index e1c7e036..386e3560 160000 --- a/qtwebchannel +++ b/qtwebchannel @@ -1 +1 @@ -Subproject commit e1c7e036431aa0da365dbdd8be7ce723cd72c7d0 +Subproject commit 386e3560adaed131681537e74f45238f29b6664a