diff options
Diffstat (limited to 'mkspecs/features')
-rw-r--r-- | mkspecs/features/ctest_testcase_common.prf | 1 | ||||
-rw-r--r-- | mkspecs/features/win32/opengl.prf | 40 |
2 files changed, 3 insertions, 38 deletions
diff --git a/mkspecs/features/ctest_testcase_common.prf b/mkspecs/features/ctest_testcase_common.prf index ea90bf89cd..7215b2d465 100644 --- a/mkspecs/features/ctest_testcase_common.prf +++ b/mkspecs/features/ctest_testcase_common.prf @@ -48,7 +48,6 @@ for (dep, dependentmodules): \ dependentmodules = $$join(mod_deps, ";") QT_FOR_CONFIG += gui-private -qtHaveModule(gui):qtConfig(angle): CMAKE_GL_DEFINES = -DQT_WITH_ANGLE=True qtHaveModule(gui):!qtConfig(egl): CMAKE_GL_DEFINES += -DNO_EGL=True CMAKE_MODULE_VERSIONS = diff --git a/mkspecs/features/win32/opengl.prf b/mkspecs/features/win32/opengl.prf index 8568a0c379..a4aca843ea 100644 --- a/mkspecs/features/win32/opengl.prf +++ b/mkspecs/features/win32/opengl.prf @@ -1,40 +1,6 @@ QT_FOR_CONFIG += gui -defineTest(prependOpenGlLib) { - path = $$QT.core.libs/$$QMAKE_PREFIX_STATICLIB$$1 - ext = .$$QMAKE_EXTENSION_STATICLIB - !mingw|qtConfig(debug_and_release): debug_suffix = "d" - QMAKE_LIBS_OPENGL_ES2 = $${path}$${ext} $$QMAKE_LIBS_OPENGL_ES2 - QMAKE_LIBS_OPENGL_ES2_DEBUG = $${path}$${debug_suffix}$${ext} $$QMAKE_LIBS_OPENGL_ES2_DEBUG - export(QMAKE_LIBS_OPENGL_ES2) - export(QMAKE_LIBS_OPENGL_ES2_DEBUG) -} - -qtConfig(opengles2) { - # Depending on the configuration we use libQtANGLE or libEGL and libGLESv2 - qtConfig(combined-angle-lib) { - prependOpenGlLib($$LIBQTANGLE_NAME) - } else { - prependOpenGlLib($$LIBGLESV2_NAME) - prependOpenGlLib($$LIBEGL_NAME) - } -# For Desktop, use the ANGLE library location passed on from configure. - INCLUDEPATH += $$QMAKE_INCDIR_OPENGL_ES2 - CONFIG(debug, debug|release) { - QMAKE_LIBDIR += $$QMAKE_LIBDIR_OPENGL_ES2_DEBUG - qtConfig(angle) { - LIBS += $$QMAKE_LIBS_OPENGL_ES2_DEBUG - } else { - LIBS += $$QMAKE_LIBS_OPENGL_ES2 - } - } else { - LIBS += $$QMAKE_LIBS_OPENGL_ES2 - QMAKE_LIBDIR += $$QMAKE_LIBDIR_OPENGL_ES2_RELEASE - } - qtConfig(static): DEFINES += GL_APICALL= EGLAPI= -} else { - !qtConfig(dynamicgl) { - QMAKE_LIBS += $$QMAKE_LIBS_OPENGL - QMAKE_LFLAGS += $$QMAKE_LFLAGS_OPENGL - } +!qtConfig(dynamicgl) { + QMAKE_LIBS += $$QMAKE_LIBS_OPENGL + QMAKE_LFLAGS += $$QMAKE_LFLAGS_OPENGL } |