limit installation of ANGLE translator and preprocessor helper libraries

libGLES2 (the only user of these libraries) is built dynamically even in a static qt built when dynamicgl is configured. in this case the static libraries need not be installed. amends 2311997. Change-Id: Ic9bc3937d6ee0d97e0ca7fc96596fa90ebfe8710 Reviewed-by: Joerg Bornemann <[email protected]>
RawnHelly · Jun 22, 2016 · 5c38740 · 5c38740
1 parent dc2fcd3
commit 5c38740
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 1 deletion.
diff --git a/mkspecs/features/qt_helper_lib.prf b/mkspecs/features/qt_helper_lib.prf
@@ -27,6 +27,6 @@ DLLDESTDIR = $$MODULE_BASE_OUTDIR/bin
 
 # In static builds of Qt, convenience libraries must be installed,
 # as in this case they are not linked to the final library/plugin.
-installed|contains(QT_CONFIG, static): load(qt_installs)
+installed|if(!not_installed:contains(QT_CONFIG, static)): load(qt_installs)
 
 TARGET = $$qt5LibraryTarget($$TARGET)
diff --git a/src/angle/src/compiler/preprocessor/preprocessor.pro b/src/angle/src/compiler/preprocessor/preprocessor.pro
@@ -1,4 +1,5 @@
 CONFIG += static
+contains(QT_CONFIG, dynamicgl): CONFIG += not_installed
 include(../../config.pri)
 
 INCLUDEPATH = $$ANGLE_DIR/src/compiler/preprocessor

diff --git a/src/angle/src/compiler/translator.pro b/src/angle/src/compiler/translator.pro
@@ -1,4 +1,5 @@
 CONFIG += static
+contains(QT_CONFIG, dynamicgl): CONFIG += not_installed
 include(../config.pri)
 
 INCLUDEPATH += \