diff options
author | Simon Hausmann <simon.hausmann@qt.io> | 2018-08-08 08:47:20 +0200 |
---|---|---|
committer | Simon Hausmann <simon.hausmann@qt.io> | 2018-08-08 14:13:28 +0000 |
commit | 76d922b211b1dce50fabbaeb46457fe9b375af8c (patch) | |
tree | 47bdb14a30eca644dcae6de21ecfb9ecf1a05477 /.gitmodules | |
parent | 0a65cf0e9cd3c6cfbd2476bb4506287d32d89ece (diff) |
Add soft qtdoc => qtquickcontrols 1/2 dependency
The photoviewer demo imports QtQuick Controls 1 and the coffee demo
imports Qt Quick Controls 2. This is a run-time dependency for dynamic
builds, but for static builds it becomes a build time dependency.
Change-Id: Ie8d7dcf85c2dfe93033fa9254ee350fb654475c3
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
Reviewed-by: Paul Wicking <paul.wicking@qt.io>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
Diffstat (limited to '.gitmodules')
-rw-r--r-- | .gitmodules | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/.gitmodules b/.gitmodules index 8ece26aa..3449e50c 100644 --- a/.gitmodules +++ b/.gitmodules @@ -58,7 +58,7 @@ priority = 30 [submodule "qtdoc"] depends = qtdeclarative qttools - recommends = qtmultimedia + recommends = qtmultimedia qtquickcontrols qtquickcontrols2 path = qtdoc url = ../qtdoc.git branch = dev |