Add qtwebengine as submodule

qtwebkit is listed as an optional dependency for
qtwebengine to ensure that qtwebkit and qtwebengine
are not linked in parallel on the CI system.
Otherwise we could run out of memory.

Change-Id: Ib80d72407df03037c928d99f55c8e04e98e506d9
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
This commit is contained in:
Frederik Gladhorn
2014-07-29 13:50:30 +02:00
committed by Jocelyn Turcotte
parent 2c3556629b
commit 22e5c8ce25
4 changed files with 7 additions and 0 deletions

3
.gitmodules vendored
View File

@@ -106,3 +106,6 @@
[submodule "qtwebchannel"]
path = qtwebchannel
url = ../qtwebchannel.git
[submodule "qtwebengine"]
path = qtwebengine
url = ../qtwebengine.git

View File

@@ -235,6 +235,7 @@ my %GERRIT_REPOS = map { $_ => "qt/$_" } qw(
qttranslations
qtwayland
qtwebchannel
qtwebengine
qtwebkit
qtwebkit-examples
qtwebsockets
@@ -268,6 +269,7 @@ my @DEFAULT_REPOS = qw(
qttranslations
qtwayland
qtwebchannel
qtwebengine
qtwebsockets
qtwebkit
qtwebkit-examples

1
qt.pro
View File

@@ -89,6 +89,7 @@ addModule(qtdocgallery, qtdeclarative, qtjsondb)
linux:!android: addModule(qtwayland, qtbase, qtdeclarative)
addModule(qtserialport, qtbase)
addModule(qtenginio, qtdeclarative)
addModule(qtwebengine, qtquickcontrols, qtwebkit)
addModule(qttranslations, qttools)
addModule(qtdoc, qtdeclarative)
addModule(qtqa, qtbase)

1
qtwebengine Submodule

Submodule qtwebengine added at f9c1fb9a88