summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexandru Croitor <alexandru.croitor@qt.io>2019-08-11 14:33:17 +0200
committerAlexandru Croitor <alexandru.croitor@qt.io>2019-08-14 13:08:44 +0200
commit8c2ecdbc27532cf875cf47ce75654be98b3d7e20 (patch)
tree9850213dc7b328036d2ed9dd0f76367b800a8bcb
parent621c18b60b640572ffbad57e7f669e048ac63bb4 (diff)
Update qt5 wip/qt6wip/qt6
Bump qtwebengine sha1 and re-enable qtwebengine and qtwebview to be built. Change-Id: I5f9f57b1083629e4294b4a34b74780a862d9e873 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
-rw-r--r--.gitmodules4
m---------qtwebengine0
2 files changed, 2 insertions, 2 deletions
diff --git a/.gitmodules b/.gitmodules
index cfd15d9a..9396d189 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -216,7 +216,7 @@
path = qtwebengine
url = ../qtwebengine.git
branch = wip/qt6
- status = ignore
+ status = addon
priority = 10
[submodule "qtcanvas3d"]
depends = qtdeclarative
@@ -230,7 +230,7 @@
path = qtwebview
url = ../qtwebview.git
branch = wip/qt6
- status = ignore
+ status = addon
[submodule "qtquickcontrols2"]
depends = qtgraphicaleffects
recommends = qtimageformats
diff --git a/qtwebengine b/qtwebengine
-Subproject 83fa1d5f9b890ba251f7dc8f82acd950e952734
+Subproject d91b839d67bcfa1cfeb3d095b6885c97c53b981