Add qtcanvas3d as submodule 77/105977/9
authorPasi Keranen <pasi.keranen@digia.com>
Wed, 11 Feb 2015 08:04:37 +0000 (10:04 +0200)
committerJani Heikkinen <jani.heikkinen@theqtcompany.com>
Fri, 13 Feb 2015 15:11:19 +0000 (15:11 +0000)
[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>
.gitmodules
qt.pro
qtcanvas3d [new submodule]

index 4ebdc3f..6a2e68a 100644 (file)
        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 e598b18..f515d82 100644 (file)
--- 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 (submodule)
index 0000000..916c59c
--- /dev/null
@@ -0,0 +1 @@
+Subproject commit 916c59c00c7df7c8f0652098462e042daac3048c