From 6ed20e1f7c2591b86a1c4b230d488ff93b379f6d Mon Sep 17 00:00:00 2001
From: Alex Blasche <alexander.blasche@digia.com>
Date: Thu, 13 Jun 2013 14:52:56 +0200
Subject: Don't build qt3d without opengl module

This is required to fix CI build of qt3d and subsequently qtlocation.

Change-Id: Iec836a88941329f773e785502a1fa528cc358415
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
---
 qt3d.pro | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

(limited to 'qt3d.pro')

diff --git a/qt3d.pro b/qt3d.pro
index 8f1f6fd49..52a56b9ae 100644
--- a/qt3d.pro
+++ b/qt3d.pro
@@ -1,3 +1,5 @@
+requires(qtHaveModule(opengl))
+
 load(qt_parts)
 
 module_qt3d_tutorials.subdir = tutorials
@@ -9,10 +11,7 @@ module_qt3d_tutorials.CONFIG = no_default_target no_default_install
 
 gcov: SUBDIRS -= sub_tools
 
-# We need opengl, minimum es2 or desktop
-!contains(QT_CONFIG, opengl) {
-    error("Qt3D requires OpenGL!")
-}
+# We need opengl, minimum es2
 contains(QT_CONFIG, opengles1) {
     error("Qt3D does not support OpenGL ES 1!")
 }
-- 
cgit v1.2.3