diff options
| author | Lars Knoll <lars.knoll@qt.io> | 2021-06-25 09:46:46 +0200 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2021-06-25 22:17:30 +0000 |
| commit | 9a2aba6192c9cd048ab57b5620d71e96afe7b299 (patch) | |
| tree | d84a21677741efe5d85a40b8349ce9ddacb97cef /.gitmodules | |
| parent | ea62a47c5642f92e91376694316928df52037a99 (diff) | |
Make QtMultimedia depend on shadertools and recommend qtquickcontrols2
Multimedia needs shadertools for building, so make that explicit.
Some examples use Qt Quick Controls, so we recommend that as well
Change-Id: If067defe371dc9584634d1c1aa7c5eae74c9af25
Reviewed-by: Daniel Smith <Daniel.Smith@qt.io>
(cherry picked from commit 4131439fb9635cac602a0783abd594e8e7e50f2e)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
Diffstat (limited to '.gitmodules')
| -rw-r--r-- | .gitmodules | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/.gitmodules b/.gitmodules index 1cbc5458..15f1ed90 100644 --- a/.gitmodules +++ b/.gitmodules @@ -23,8 +23,8 @@ branch = 6.2 status = addon [submodule "qtmultimedia"] - depends = qtbase - recommends = qtdeclarative + depends = qtbase qtshadertools + recommends = qtdeclarative qtquickcontrols2 path = qtmultimedia url = ../qtmultimedia.git branch = 6.2 |