summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-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