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 <[email protected]>
RawnHelly · Jun 22, 2016 · 32a3bcb · 32a3bcb
1 parent 5c38740
commit 32a3bcb
Showing 1 changed file with 6 additions and 6 deletions.
diff --git 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=