aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJani Heikkinen <jani.heikkinen@qt.io>2021-05-18 14:43:06 +0300
committerJani Heikkinen <jani.heikkinen@qt.io>2021-05-18 17:18:41 +0300
commit66ce587c4693fcae28bcf8dcee4a13be1abc3710 (patch)
tree55c9bfb9e961dd4c81c95c18a514f3e5d41934a3
parent2cca3aa04986778ed50c703b35f68e5123acf302 (diff)
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 <allan.jensen@qt.io>
-rw-r--r--.gitmodules2
m---------qtwebchannel0
2 files changed, 1 insertions, 1 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
-Subproject e1c7e036431aa0da365dbdd8be7ce723cd72c7d
+Subproject 386e3560adaed131681537e74f45238f29b6664