summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFrederik Gladhorn <frederik.gladhorn@theqtcompany.com>2015-08-19 09:02:18 +0200
committerSimon Hausmann <simon.hausmann@theqtcompany.com>2015-09-03 17:40:17 +0000
commit4c520caa6919b115745710fa676ba995f4843a6f (patch)
tree26730e86245ec1008d3675d6585deee3ff905e9f
parent4116ec2474e608c9a752ace5e8eb92cbd4052ebc (diff)
Add qtwebview as submodule
Change-Id: I6a69b08945767f4cb8f4164630c726cf8bf552bb Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com> Reviewed-by: Christian Stromme <christian.stromme@theqtcompany.com>
-rw-r--r--.gitmodules5
-rw-r--r--qt.pro1
m---------qtwebview0
3 files changed, 6 insertions, 0 deletions
diff --git a/.gitmodules b/.gitmodules
index 57a2b261..804c0e84 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -176,3 +176,8 @@
url = ../qtcanvas3d.git
branch = 5.6
initrepo = true
+[submodule "qtwebview"]
+ path = qtwebview
+ url = ../qtwebview.git
+ branch = 5.6
+ initrepo = true
diff --git a/qt.pro b/qt.pro
index 0147ad2b..2ea0fb04 100644
--- a/qt.pro
+++ b/qt.pro
@@ -58,6 +58,7 @@ ANDROID_EXTRAS =
android: ANDROID_EXTRAS = qtandroidextras
addModule(qtbase)
+addModule(qtwebview, qtdeclarative, qtwebengine)
addModule(qtandroidextras, qtbase)
addModule(qtmacextras, qtbase)
addModule(qtx11extras, qtbase)
diff --git a/qtwebview b/qtwebview
new file mode 160000
+Subproject 1b5a69309d2702b8339c9829f86ea685ca4ad90