From 49e36525ce1ef94535335895131a368a3e87e341 Mon Sep 17 00:00:00 2001 From: Kai Koehne Date: Tue, 3 May 2016 09:52:29 +0200 Subject: Skip build for missing opengl dependencies MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Do not error out if opengl is missing, but rather skip the build. This allows people to compile qt-everywhere packages with e.g. -no-opengl . Change-Id: I08212b53e37931347b6f6bea5736f99111bcdc92 Reviewed-by: Tomi Korpipää --- qtdatavis3d.pro | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) (limited to 'qtdatavis3d.pro') diff --git a/qtdatavis3d.pro b/qtdatavis3d.pro index ab70c061..5284069b 100644 --- a/qtdatavis3d.pro +++ b/qtdatavis3d.pro @@ -1,13 +1,9 @@ requires(qtHaveModule(widgets)) -load(qt_parts) - # We need opengl, minimum es2 or desktop -!contains(QT_CONFIG, opengl) { - error(QtDataVisualization requires OpenGL!) -} -contains(QT_CONFIG, opengles1) { - error(QtDataVisualization does not support OpenGL ES 1!) -} +requires(contains(QT_CONFIG, opengl)) +requires(!contains(QT_CONFIG, opengles1)) + +load(qt_parts) OTHER_FILES += README dist/* .qmake.conf -- cgit v1.2.3