diff options
| author | Andy Nichols <andy.nichols@theqtcompany.com> | 2016-06-23 17:01:14 +0200 |
|---|---|---|
| committer | Andy Nichols <andy.nichols@qt.io> | 2016-06-28 10:19:00 +0000 |
| commit | 7cb4e968e4a624e1f4e74bace7e7f8013452f779 (patch) | |
| tree | 1d486e2e131be98c95ca8cc4a47a0495e69e4b43 /src/src.pro | |
| parent | 22d2780cfe3a30fc33894efb8e3f7b25cfeac0fd (diff) | |
Fix build when building with QT_NO_OPENGL
Now that it is possible to build qtdeclarative when QT_NO_OPENGL is
defined, it is no longer safe to assume qtHaveModule(quick) == OpenGL.
So for the time being building of qtmultimediaquick tools is disabled
when qt is built without opengl support, as the implementation depends
on OpenGL currently.
Change-Id: Iec76d25c5a86ee16674bf433c492585ad5f87988
Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>
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 e8d430e51..b0566023d 100644 --- a/src/src.pro +++ b/src/src.pro @@ -13,7 +13,7 @@ src_plugins.subdir = plugins src_plugins.depends = multimedia -qtHaveModule(quick) { +qtHaveModule(quick):contains(QT_CONFIG, opengl) { src_qtmultimediaquicktools.subdir = qtmultimediaquicktools src_qtmultimediaquicktools.depends = multimedia |