summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPasi Keranen <pasi.keranen@digia.com>2015-02-11 10:04:37 +0200
committerJani Heikkinen <jani.heikkinen@theqtcompany.com>2015-02-13 15:11:19 +0000
commit682766b9fa93aec6a3e961f1842ae85af78a618c (patch)
tree93399a7d480e7b6b69aa1cdb999bf02224a77e33
parent3e40bbd114fcb81c3ec173ba26955f13a24f05f6 (diff)
Add qtcanvas3d as submodule
[ChangeLog][General] Added QtCanvas3D module, a JavaScript 3D rendering API for QtQuick. Change-Id: I9448f87ba8c8ccfb2dd6cf790d29bb561b9e9740 Reviewed-by: Pasi Keränen <pasi.keranen@digia.com> Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
-rw-r--r--.gitmodules5
-rw-r--r--qt.pro1
m---------qtcanvas3d0
3 files changed, 6 insertions, 0 deletions
diff --git a/.gitmodules b/.gitmodules
index 4ebdc3f5..6a2e68a1 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -173,3 +173,8 @@
url = ../qtwebengine.git
branch = dev
initrepo = true
+[submodule "qtcanvas3d"]
+ path = qtcanvas3d
+ url = ../qtcanvas3d.git
+ branch = dev
+ initrepo = true
diff --git a/qt.pro b/qt.pro
index e598b18f..f515d828 100644
--- a/qt.pro
+++ b/qt.pro
@@ -81,6 +81,7 @@ addModule(qttools, qtbase, qtdeclarative qtactiveqt qtwebkit)
addModule(qtwebkit-examples, qtwebkit qttools)
addModule(qtimageformats, qtbase)
addModule(qt3d, qtdeclarative qtimageformats)
+addModule(qtcanvas3d, qtdeclarative)
addModule(qtgraphicaleffects, qtdeclarative)
addModule(qtscript, qtbase, qttools)
addModule(qtquick1, qtscript, qtsvg qtxmlpatterns qtwebkit)
diff --git a/qtcanvas3d b/qtcanvas3d
new file mode 160000
+Subproject 916c59c00c7df7c8f0652098462e042daac3048