From 682766b9fa93aec6a3e961f1842ae85af78a618c Mon Sep 17 00:00:00 2001 From: Pasi Keranen Date: Wed, 11 Feb 2015 10:04:37 +0200 Subject: [PATCH] Add qtcanvas3d as submodule MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [ChangeLog][General] Added QtCanvas3D module, a JavaScript 3D rendering API for QtQuick. Change-Id: I9448f87ba8c8ccfb2dd6cf790d29bb561b9e9740 Reviewed-by: Pasi Keränen Reviewed-by: Jani Heikkinen --- .gitmodules | 5 +++++ qt.pro | 1 + qtcanvas3d | 1 + 3 files changed, 7 insertions(+) create mode 160000 qtcanvas3d 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 index 00000000..916c59c0 --- /dev/null +++ b/qtcanvas3d @@ -0,0 +1 @@ +Subproject commit 916c59c00c7df7c8f0652098462e042daac3048c