AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix double installation of ANGLE libraries in static+dynamicgl builds

Browse Source 
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>
This commit is contained in:
Oswald Buddenhagen 2016-06-21 17:25:49 +02:00
parent 5c38740031
commit 32a3bcb359
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/angle/src/common/common.pri
View File

@ -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 CONFIG += installed
include (../config.pri) 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= static: DEFINES *= LIBGLESV2_EXPORT_H_ ANGLE_EXPORT=