From 231199798ab3eff88ab87511af1dd87630173adb Mon Sep 17 00:00:00 2001 From: Andrew Knight Date: Thu, 24 Sep 2015 10:42:43 +0300 Subject: [PATCH] Build ANGLE dynamically under static builds which have dynamic GL enabled MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Task-number: QTBUG-46814 Change-Id: I8108bcd6f8badbb135f593dcf280470e03b11bff Reviewed-by: Jan Arve Sæther Reviewed-by: Laszlo Agocs Reviewed-by: Friedemann Kleint --- src/angle/src/common/common.pri | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/angle/src/common/common.pri b/src/angle/src/common/common.pri index 57f92f1089..8e2333d2ba 100644 --- a/src/angle/src/common/common.pri +++ b/src/angle/src/common/common.pri @@ -48,4 +48,10 @@ winrt|if(msvc:!win32-msvc2005:!win32-msvc2008:!win32-msvc2010) { } } +# static builds should still link ANGLE dynamically when dynamic GL is enabled +static:contains(QT_CONFIG, dynamicgl) { + CONFIG -= static + CONFIG += shared +} + static: DEFINES *= LIBGLESV2_EXPORT_H_ ANGLE_EXPORT=