diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-05-19 08:57:59 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-05-19 08:57:59 +0200 |
| commit | 550e16b8141caf8d6c0614a423a295b0aea9cab1 (patch) | |
| tree | 1495e6a9808d1140142a2cf46c6e36cba95f8890 /src/plugins/platforms/windows | |
| parent | 087b4fc6cd3a68db6ac4c3a7f43c03aa6e73c088 (diff) | |
| parent | 9954187adba4d26a1b1aa93874993f15d6d8a0b9 (diff) | |
Merge remote-tracking branch 'origin/5.9.0' into 5.9
Change-Id: Ia8ac1960387c0f78c32f9d0385bb0aa9a8209af1
Diffstat (limited to 'src/plugins/platforms/windows')
| -rw-r--r-- | src/plugins/platforms/windows/windows.pri | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/src/plugins/platforms/windows/windows.pri b/src/plugins/platforms/windows/windows.pri index 7d3ecc8aa2..73677311f5 100644 --- a/src/plugins/platforms/windows/windows.pri +++ b/src/plugins/platforms/windows/windows.pri @@ -1,6 +1,8 @@ # Note: OpenGL32 must precede Gdi32 as it overwrites some functions. LIBS += -lole32 -luser32 -lwinspool -limm32 -lwinmm -loleaut32 +QT_FOR_CONFIG += gui + qtConfig(opengl):!qtConfig(opengles2):!qtConfig(dynamicgl): LIBS *= -lopengl32 mingw: LIBS *= -luuid @@ -99,5 +101,10 @@ RESOURCES += $$PWD/openglblacklists.qrc qtConfig(accessibility): include($$PWD/accessible/accessible.pri) -DEFINES *= LIBEGL_NAME=$${LIBQTANGLE_NAME} -DEFINES *= LIBGLESV2_NAME=$${LIBQTANGLE_NAME} +qtConfig(combined-angle-lib) { + DEFINES *= LIBEGL_NAME=$${LIBQTANGLE_NAME} + DEFINES *= LIBGLESV2_NAME=$${LIBQTANGLE_NAME} +} else { + DEFINES *= LIBEGL_NAME=$${LIBEGL_NAME} + DEFINES *= LIBGLESV2_NAME=$${LIBGLESV2_NAME} +} |