From 82f2b64659b46ef20def4cc6a7a44dd16baa3864 Mon Sep 17 00:00:00 2001 From: Jani Heikkinen Date: Wed, 12 May 2021 10:33:22 +0300 Subject: [PATCH] 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 --- .gitmodules | 2 +- qtwebsockets | 2 +- 2 files changed, 2 insertions(+), 2 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 index ec60f42c..edcfbf74 160000 --- a/qtwebsockets +++ b/qtwebsockets @@ -1 +1 @@ -Subproject commit ec60f42c579fcfe6a26c1c0ccb2477ca3ee5ea12 +Subproject commit edcfbf747f56d4fef9da78843e5dca78b8894793