From 0492f4a4c5d8c254595ffd3d8581d508ef85f90a Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Thu, 7 Jul 2016 16:36:26 +0200 Subject: rectify opengl configuration under windows angle is an implementation of es2 and thus autodetected if es2 is requested. but this also means that it is actually *not* mutually exclusive with dynamicgl - quite the opposite. express that sensibly in the build system. this implies that we will now get sensible messages from configure if angle is not detected while building with dynamicgl. furthermore, this simplifies the handling of defaults, removes the unnecessary case in checkAvailability() (checkAngleAvailability() is always called directly), fixes the complaint on winrt if gles2 is disabled, and avoids redundant checks for the purpose of obtaining an error message. Change-Id: I3373f0ad7d5484d1bac8dbde3f8ee6fca89ebcb8 Reviewed-by: Lars Knoll Reviewed-by: Laszlo Agocs --- src/gui/gui.pro | 2 +- src/src.pro | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/gui/gui.pro b/src/gui/gui.pro index 462f133ff8..d1d0041616 100644 --- a/src/gui/gui.pro +++ b/src/gui/gui.pro @@ -18,7 +18,7 @@ MODULE_PLUGIN_TYPES = \ egldeviceintegrations # This is here only because the platform plugin is no module, obviously. -win32:contains(QT_CONFIG, angle)|contains(QT_CONFIG, dynamicgl) { +contains(QT_CONFIG, angle) { MODULE_AUX_INCLUDES = \ \$\$QT_MODULE_INCLUDE_BASE/QtANGLE } diff --git a/src/src.pro b/src/src.pro index ac336f316d..c4da871abe 100644 --- a/src/src.pro +++ b/src/src.pro @@ -163,7 +163,7 @@ contains(QT_CONFIG, concurrent):SUBDIRS += src_concurrent SUBDIRS += src_3rdparty_harfbuzzng src_gui.depends += src_3rdparty_harfbuzzng } - win32:contains(QT_CONFIG, angle)|contains(QT_CONFIG, dynamicgl) { + contains(QT_CONFIG, angle) { SUBDIRS += src_angle src_gui.depends += src_angle } -- cgit v1.2.3