From da632b95d2289d1a963233fc8106f8e988b8f1ff Mon Sep 17 00:00:00 2001 From: Jani Heikkinen Date: Wed, 5 May 2021 12:46:14 +0300 Subject: [PATCH] Restore qtremoteobjects as a addon in qt5.git According to plan Qt Remote Objects will be back in Qt 6.2 so let's add it in official builds Task-number: QTBUG-93139 Change-Id: Ia4c9feae94b69f01a3c36872b346aa872f0e6654 Reviewed-by: Sona Kurazyan --- .gitmodules | 2 +- qtremoteobjects | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitmodules b/.gitmodules index 6f2b49fa..b15ec1d8 100644 --- a/.gitmodules +++ b/.gitmodules @@ -285,7 +285,7 @@ path = qtremoteobjects url = ../qtremoteobjects.git branch = dev - status = ignore + status = addon [submodule "qtwebglplugin"] depends = qtbase qtwebsockets recommends = qtdeclarative diff --git a/qtremoteobjects b/qtremoteobjects index c603dac0..9062f3eb 160000 --- a/qtremoteobjects +++ b/qtremoteobjects @@ -1 +1 @@ -Subproject commit c603dac09f0099fd9a6482fb315e2c069a7ef5ac +Subproject commit 9062f3eb75a1959c78107dfd6e13b6fa6b1a8711