summaryrefslogtreecommitdiffstats
path: root/.gitmodules
diff options
context:
space:
mode:
authorLiang Qi <liang.qi@qt.io>2018-08-06 11:31:33 +0200
committerLiang Qi <liang.qi@qt.io>2018-08-06 11:31:33 +0200
commitd746bc3ea8297e22ec609a80a77a9596b5ce1471 (patch)
tree5cde1556e817efbd3aa93cac0b36b71edea7bcc5 /.gitmodules
parenta43a23f7d17c6d3450bcce40409887e57df485e7 (diff)
parent00730d1caf7c5fb2e4eb914985c41e9221a03708 (diff)
Merge remote-tracking branch 'origin/5.11' into dev
Conflicts: coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/02-apt.sh Change-Id: If414fac20cc1cddd155a9f9c8048d0ad76ac54ef
Diffstat (limited to '.gitmodules')
-rw-r--r--.gitmodules7
1 files changed, 0 insertions, 7 deletions
diff --git a/.gitmodules b/.gitmodules
index 759ea491..c7a6947d 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -143,13 +143,6 @@
url = ../qtimageformats.git
branch = dev
status = addon
-[submodule "qtquick1"]
- depends = qtscript
- recommends = qtsvg qtxmlpatterns
- path = qtquick1
- url = ../qtquick1.git
- branch = dev
- status = ignore
[submodule "qtgraphicaleffects"]
depends = qtdeclarative
path = qtgraphicaleffects