summaryrefslogtreecommitdiffstats
path: root/.gitmodules
diff options
context:
space:
mode:
authorLiang Qi <liang.qi@qt.io>2017-10-05 12:47:24 +0200
committerLiang Qi <liang.qi@qt.io>2017-10-05 12:47:24 +0200
commit1099b1ddcef203df81d4d19cecba8b2813d413d7 (patch)
tree0abc9f9cee5fa597a8d8bb3ebf64cd9ba6b9d06e /.gitmodules
parentcdab32be2368ffd234c9ace4233916cfc3682563 (diff)
parent9a096e6841e38c79fa3c81036e5d8c5b1e792e5c (diff)
Merge remote-tracking branch 'origin/5.10' into dev
Conflicts: .gitmodules coin/platform_configs/qt5.txt Change-Id: I4dee3bb4aab69430fc013ce509e20b7a9b9e4f47
Diffstat (limited to '.gitmodules')
-rw-r--r--.gitmodules1
1 files changed, 1 insertions, 0 deletions
diff --git a/.gitmodules b/.gitmodules
index f045d5ce..7144b246 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -243,6 +243,7 @@
status = addon
[submodule "qtquickcontrols2"]
depends = qtgraphicaleffects
+ recommends = qtimageformats
path = qtquickcontrols2
url = ../qtquickcontrols2.git
branch = dev