diff options
Diffstat (limited to 'src/plugins/platforms/windows/windows.pri')
| -rw-r--r-- | src/plugins/platforms/windows/windows.pri | 24 |
1 files changed, 4 insertions, 20 deletions
diff --git a/src/plugins/platforms/windows/windows.pri b/src/plugins/platforms/windows/windows.pri index 95ba961df1..b71c24068c 100644 --- a/src/plugins/platforms/windows/windows.pri +++ b/src/plugins/platforms/windows/windows.pri @@ -3,15 +3,14 @@ LIBS += -lwinspool -limm32 -loleaut32 QT_FOR_CONFIG += gui -qtConfig(opengl):!qtConfig(opengles2):!qtConfig(dynamicgl): LIBS *= -lopengl32 +qtConfig(opengl):!qtConfig(dynamicgl): LIBS *= -lopengl32 mingw: QMAKE_USE *= uuid -# For the dialog helpers: + LIBS += -lshlwapi -lwtsapi32 QMAKE_USE_PRIVATE += \ advapi32 \ - d3d9/nolink \ ole32 \ shell32 \ user32 \ @@ -70,20 +69,12 @@ INCLUDEPATH += $$PWD qtConfig(opengl): HEADERS += $$PWD/qwindowsopenglcontext.h -qtConfig(opengles2) { - SOURCES += $$PWD/qwindowseglcontext.cpp - HEADERS += $$PWD/qwindowseglcontext.h -} else: qtConfig(opengl) { +# Only WGL is supported in Qt 6, ANGLE is removed +qtConfig(opengl) { SOURCES += $$PWD/qwindowsglcontext.cpp HEADERS += $$PWD/qwindowsglcontext.h } -# Dynamic GL needs both WGL and EGL -qtConfig(dynamicgl) { - SOURCES += $$PWD/qwindowseglcontext.cpp - HEADERS += $$PWD/qwindowseglcontext.h -} - qtConfig(systemtrayicon) { SOURCES += $$PWD/qwindowssystemtrayicon.cpp HEADERS += $$PWD/qwindowssystemtrayicon.h @@ -121,10 +112,3 @@ RESOURCES += $$PWD/openglblacklists.qrc qtConfig(accessibility): include($$PWD/uiautomation/uiautomation.pri) -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} -} |