From 22e5c8ce25c6f7760fba355e66efb35806c245d7 Mon Sep 17 00:00:00 2001 From: Frederik Gladhorn Date: Tue, 29 Jul 2014 13:50:30 +0200 Subject: 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 Reviewed-by: Jocelyn Turcotte --- .gitmodules | 3 +++ init-repository | 2 ++ qt.pro | 1 + qtwebengine | 1 + 4 files changed, 7 insertions(+) create mode 160000 qtwebengine 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 index 00000000..f9c1fb9a --- /dev/null +++ b/qtwebengine @@ -0,0 +1 @@ +Subproject commit f9c1fb9a88144aa546879085f74eb701651b9593 -- cgit v1.2.3