Add qtwebview as submodule
authorFrederik Gladhorn <frederik.gladhorn@theqtcompany.com>
Wed, 19 Aug 2015 07:02:18 +0000 (09:02 +0200)
committerSimon Hausmann <simon.hausmann@theqtcompany.com>
Thu, 3 Sep 2015 17:40:17 +0000 (17:40 +0000)
Change-Id: I6a69b08945767f4cb8f4164630c726cf8bf552bb
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
Reviewed-by: Christian Stromme <christian.stromme@theqtcompany.com>
.gitmodules
qt.pro
qtwebview [new submodule]

index 57a2b26..804c0e8 100644 (file)
        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 0147ad2..2ea0fb0 100644 (file)
--- 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 (submodule)
index 0000000..1b5a693
--- /dev/null
+++ b/qtwebview
@@ -0,0 +1 @@
+Subproject commit 1b5a69309d2702b8339c9829f86ea685ca4ad903