1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

remove spurious QT_CONFIG -= opengl

Browse Source 
it's not quite clear what the purpose of this is supposed to be,
especially given that the prf is loaded way after anyone would have
examined QT_CONFIG.

Change-Id: Ia49377c952902fed4084178c7f857e1acd11ad03
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
This commit is contained in:
Oswald Buddenhagen 2016-08-16 10:14:27 +02:00
parent 3bf0c14a26
commit 0b93d1a10a
1 changed files with 0 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
mkspecs/features/win32/opengl.prf
View File

@ -14,7 +14,6 @@ contains(QT_CONFIG, opengles2) {
} }
DEFINES += QT_OPENGL_ES_2 QT_OPENGL_ES_2_ANGLE DEFINES += QT_OPENGL_ES_2 QT_OPENGL_ES_2_ANGLE
contains(QT_CONFIG, static): DEFINES += QT_OPENGL_ES_2_ANGLE_STATIC GL_APICALL= EGLAPI= contains(QT_CONFIG, static): DEFINES += QT_OPENGL_ES_2_ANGLE_STATIC GL_APICALL= EGLAPI=
QT_CONFIG -= opengl
} else { } else {
!contains(QT_CONFIG, dynamicgl) { !contains(QT_CONFIG, dynamicgl) {
QMAKE_LIBS += $$QMAKE_LIBS_OPENGL QMAKE_LIBS += $$QMAKE_LIBS_OPENGL