diff options
author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-11-05 07:33:34 +0100 |
---|---|---|
committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-11-05 07:33:34 +0100 |
commit | a045c989e15feda1201e81d8c2a7a403c33ad6da (patch) | |
tree | d5bf41f7229a4c0fd8f23bb74570fc3bc08d03a6 /src/src.pro | |
parent | 4b99c0e0474da438e8b3e978dc84c2fb9880f6ce (diff) | |
parent | 8b92454d6fffcee7a8cf1fb5e0c92920c77733c8 (diff) |
Merge remote-tracking branch 'origin/5.13' into 5.14v5.14.0-beta3
Conflicts:
.qmake.conf
Change-Id: I255dc22dc21d3629a41a8c2ae2076c48b594e626
Diffstat (limited to 'src/src.pro')
-rw-r--r-- | src/src.pro | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/src.pro b/src/src.pro index 97a053379..1dc1015c6 100644 --- a/src/src.pro +++ b/src/src.pro @@ -16,7 +16,7 @@ src_plugins.subdir = plugins src_plugins.depends = multimedia -qtHaveModule(quick):qtConfig(opengl) { +qtHaveModule(quick) { src_qtmultimediaquicktools.subdir = qtmultimediaquicktools src_qtmultimediaquicktools.depends = multimedia |