aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFrederik Gladhorn <frederik.gladhorn@digia.com>2014-07-29 13:50:30 +0200
committerJocelyn Turcotte <jocelyn.turcotte@digia.com>2014-08-29 14:28:35 +0200
commit22e5c8ce25c6f7760fba355e66efb35806c245d7 (patch)
tree6701e9dc25bd418ee5b7c96dd0a82b268f0e98f3
parent2c3556629bab77b013eabcf6535512e902837e40 (diff)
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>
-rw-r--r--.gitmodules3
-rwxr-xr-xinit-repository2
-rw-r--r--qt.pro1
m---------qtwebengine0
4 files changed, 6 insertions, 0 deletions
diff --git a/.gitmodules b/.gitmodules
index 66b86f89..1793289b 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -106,3 +106,6 @@
[submodule "qtwebchannel"]
path = qtwebchannel
url = ../qtwebchannel.git
+[submodule "qtwebengine"]
+ path = qtwebengine
+ url = ../qtwebengine.git
diff --git a/init-repository b/init-repository
index 22254893..6f02a142 100755
--- a/init-repository
+++ b/init-repository
@@ -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
diff --git a/qt.pro b/qt.pro
index 3a51f9a5..b7a73797 100644
--- a/qt.pro
+++ b/qt.pro
@@ -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)
diff --git a/qtwebengine b/qtwebengine
new file mode 160000
+Subproject f9c1fb9a88144aa546879085f74eb701651b959