summaryrefslogtreecommitdiffstats
path: root/.gitmodules
diff options
context:
space:
mode:
authorOswald Buddenhagen <oswald.buddenhagen@qt.io>2018-08-07 19:29:56 +0200
committerOswald Buddenhagen <oswald.buddenhagen@qt.io>2018-08-08 10:21:09 +0000
commit0a65cf0e9cd3c6cfbd2476bb4506287d32d89ece (patch)
tree1428c4e91e2425a51f369d55041332955a619fc1 /.gitmodules
parent4ece0e74ef2297a790ec1b8ac76337f0bc00ab25 (diff)
add soft dep qtdoc => qtmultimedia
at least the maroon demo will use the multimedia module if available. Task-number: QTBUG-69823 Change-Id: I7e0f7103aaf1a33a755b9a362274273a9b997f37 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io> Reviewed-by: Martin Smith <martin.smith@qt.io> Reviewed-by: Alexander Shevchenko <sav_ix@ukr.net>
Diffstat (limited to '.gitmodules')
-rw-r--r--.gitmodules1
1 files changed, 1 insertions, 0 deletions
diff --git a/.gitmodules b/.gitmodules
index c7a6947d..8ece26aa 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -58,6 +58,7 @@
priority = 30
[submodule "qtdoc"]
depends = qtdeclarative qttools
+ recommends = qtmultimedia
path = qtdoc
url = ../qtdoc.git
branch = dev