summaryrefslogtreecommitdiffstats
path: root/.gitmodules
diff options
context:
space:
mode:
authorLiang Qi <liang.qi@qt.io>2017-12-20 08:54:29 +0100
committerLiang Qi <liang.qi@qt.io>2017-12-20 08:17:41 +0000
commitba6ae3be9a6617ee8fda0ccc7c0e0f2f35ddbaa6 (patch)
treeeba10cf82b1870d828acdcec47b6d33dfd594790 /.gitmodules
parent6b7ee9a8f070894e3fbfd9c1a321519005a8d279 (diff)
Revert "Temporarily ignore qtcanvas3d"
QtCanvas3D adapted to new internal api in qtdeclarative. This reverts commit 146bda6468f966f64b3cc26a800798507154ef0d. Task-number: QTBUG-64766 Change-Id: I709cb8856b674edc1a7d3217fdf68cbe8aca1608 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
Diffstat (limited to '.gitmodules')
-rw-r--r--.gitmodules2
1 files changed, 1 insertions, 1 deletions
diff --git a/.gitmodules b/.gitmodules
index 8879db1d..1fc98730 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -233,7 +233,7 @@
path = qtcanvas3d
url = ../qtcanvas3d.git
branch = dev
- status = ignore
+ status = addon
[submodule "qtwebview"]
depends = qtdeclarative
recommends = qtwebengine