diff options
author | Tasuku Suzuki <tasuku.suzuki@qt.io> | 2017-06-20 11:34:53 +0900 |
---|---|---|
committer | Mitch Curtis <mitch.curtis@qt.io> | 2020-05-23 00:47:42 +0000 |
commit | 598f82300abb3ffd6164f7213265808c4779b7cc (patch) | |
tree | 053faf0018275ac7230d389e49668b0bada1f7d2 | |
parent | fa58a227cd14d301d7d10b6dce85eace953fa211 (diff) |
Remove the qtquickcontrols2 dependency on qtgraphicaleffects
The Material style uses its own shader effects, and
recent patches did the same for the Imagine style.
There were some auto tests that have been made to only
run if qtgraphicaleffects is available.
Change-Id: Ifcfcad9591d2a0a8d5ebed505566cd0103dd9176
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
-rw-r--r-- | .gitmodules | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/.gitmodules b/.gitmodules index 6da4e828..a96b85b1 100644 --- a/.gitmodules +++ b/.gitmodules @@ -225,8 +225,8 @@ branch = dev status = ignore [submodule "qtquickcontrols2"] - depends = qtgraphicaleffects - recommends = qtimageformats + depends = qtdeclarative + recommends = qtimageformats qtgraphicaleffects path = qtquickcontrols2 url = ../qtquickcontrols2.git branch = dev |