diff options
| author | Alex Blasche <alexander.blasche@digia.com> | 2013-06-13 14:52:56 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-06-13 16:04:40 +0200 |
| commit | 6ed20e1f7c2591b86a1c4b230d488ff93b379f6d (patch) | |
| tree | 120921b7eeac545af2b1a90f466d49a148ea1300 /qt3d.pro | |
| parent | 10fe302867edc161adf2db98254a056c20329f38 (diff) | |
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>
Diffstat (limited to 'qt3d.pro')
| -rw-r--r-- | qt3d.pro | 7 |
1 files changed, 3 insertions, 4 deletions
@@ -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!") } |