From 7cb4e968e4a624e1f4e74bace7e7f8013452f779 Mon Sep 17 00:00:00 2001
From: Andy Nichols <andy.nichols@theqtcompany.com>
Date: Thu, 23 Jun 2016 17:01:14 +0200
Subject: 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>
---
 src/src.pro | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/src.pro')

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
 
-- 
cgit v1.2.3