aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJani Heikkinen <jani.heikkinen@qt.io>2021-06-03 10:29:04 +0300
committerJani Heikkinen <jani.heikkinen@qt.io>2021-06-07 10:22:27 +0300
commitd71ae6f83242232f289a54c21aff83b4fb9610b2 (patch)
tree4254f86bd940025eefcd038a8e345d58c55ba6d9
parentb28866f7b1d4117ad5e04777021898504b8a55af (diff)
Restore qtwebview as a addon in qt5.git
According to plan Qt Webview will be back in Qt 6.2 so let's add it in official builds Task-number: QTBUG-93222 Change-Id: I20a20e74f08327a15d6c3985a42efc01b01a5848 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io> Reviewed-by: Michal Klocek <michal.klocek@qt.io>
-rw-r--r--.gitmodules2
m---------qtwebview0
2 files changed, 1 insertions, 1 deletions
diff --git a/.gitmodules b/.gitmodules
index 92fdc6af..976eea95 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -205,7 +205,7 @@
path = qtwebview
url = ../qtwebview.git
branch = dev
- status = ignore
+ status = addon
[submodule "qtquickcontrols2"]
depends = qtdeclarative
recommends = qtimageformats qtgraphicaleffects
diff --git a/qtwebview b/qtwebview
-Subproject dfbe1343cd7d34a5fa3c9854568cc28e265df15
+Subproject bd8c42b186c74b398f28189fe9db7841f8e47bb