aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJani Heikkinen <jani.heikkinen@qt.io>2021-05-12 10:33:22 +0300
committerJani Heikkinen <jani.heikkinen@qt.io>2021-05-18 10:13:38 +0300
commit82f2b64659b46ef20def4cc6a7a44dd16baa3864 (patch)
treedaa2a7a06590a3bb3167ac65dff68d53b354a11f
parent6056d3be5f8ed0352c9df7169d4b4b3799228fb6 (diff)
Restore qtwebsockets as a addon in qt5.git
According to plan Qt Web Sockets will be back in Qt 6.2 so let's add it in official builds Task-number: QTBUG-93684 Change-Id: Idbbc0e5c553bcd863f4b8ad21b9aee6057fe139e Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
-rw-r--r--.gitmodules2
m---------qtwebsockets0
2 files changed, 1 insertions, 1 deletions
diff --git a/.gitmodules b/.gitmodules
index a559afa1..32be037a 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -177,7 +177,7 @@
path = qtwebsockets
url = ../qtwebsockets.git
branch = dev
- status = ignore
+ status = addon
[submodule "qtwebchannel"]
depends = qtbase
recommends = qtdeclarative qtwebsockets
diff --git a/qtwebsockets b/qtwebsockets
-Subproject ec60f42c579fcfe6a26c1c0ccb2477ca3ee5ea1
+Subproject edcfbf747f56d4fef9da78843e5dca78b889479