From 32a3bcb359f362d9bcb2e3083a481978f1a952de Mon Sep 17 00:00:00 2001
From: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
Date: Tue, 21 Jun 2016 17:25:49 +0200
Subject: [PATCH] fix double installation of ANGLE libraries in
 static+dynamicgl builds

CONFIG static/shared needs to be manipulated before it is used by
qt_installs.prf (via qt_helper_lib.prf via config.pri).

amends 2311997.

Task-number: QTBUG-54109
Change-Id: Icb53f3170e6d6f09d60b77a221f4f239c6e6721f
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
---
 src/angle/src/common/common.pri | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/angle/src/common/common.pri b/src/angle/src/common/common.pri
index 50dde6398b..83cd1e8687 100644
--- a/src/angle/src/common/common.pri
+++ b/src/angle/src/common/common.pri
@@ -1,3 +1,9 @@
+# static builds should still link ANGLE dynamically when dynamic GL is enabled
+static:contains(QT_CONFIG, dynamicgl) {
+    CONFIG -= static
+    CONFIG += shared
+}
+
 CONFIG += installed
 include (../config.pri)
 
@@ -48,10 +54,4 @@ 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=