diff options
Diffstat (limited to 'src/plugins/platforms/windows/.prev_CMakeLists.txt')
-rw-r--r-- | src/plugins/platforms/windows/.prev_CMakeLists.txt | 34 |
1 files changed, 4 insertions, 30 deletions
diff --git a/src/plugins/platforms/windows/.prev_CMakeLists.txt b/src/plugins/platforms/windows/.prev_CMakeLists.txt index 29bd26a67e..c87a51e04a 100644 --- a/src/plugins/platforms/windows/.prev_CMakeLists.txt +++ b/src/plugins/platforms/windows/.prev_CMakeLists.txt @@ -132,34 +132,20 @@ qt_extend_target(QWindowsIntegrationPlugin CONDITION QT_FEATURE_directwrite3 #### Keys ignored in scope 6:.:.:windows.pro:NOT TARGET___equals____ss_QT_DEFAULT_QPA_PLUGIN: # PLUGIN_EXTENDS = "-" -qt_extend_target(QWindowsIntegrationPlugin CONDITION QT_FEATURE_opengl AND NOT QT_FEATURE_dynamicgl AND NOT QT_FEATURE_opengles2 +qt_extend_target(QWindowsIntegrationPlugin CONDITION QT_FEATURE_opengl AND NOT QT_FEATURE_dynamicgl PUBLIC_LIBRARIES opengl32 ) -qt_extend_target(QWindowsIntegrationPlugin CONDITION mingw +qt_extend_target(QWindowsIntegrationPlugin CONDITION MINGW PUBLIC_LIBRARIES uuid ) qt_extend_target(QWindowsIntegrationPlugin CONDITION QT_FEATURE_opengl SOURCES - qwindowsopenglcontext.h -) - -qt_extend_target(QWindowsIntegrationPlugin CONDITION QT_FEATURE_opengles2 - SOURCES - qwindowseglcontext.cpp qwindowseglcontext.h -) - -qt_extend_target(QWindowsIntegrationPlugin CONDITION QT_FEATURE_opengl AND NOT QT_FEATURE_opengles2 - SOURCES qwindowsglcontext.cpp qwindowsglcontext.h -) - -qt_extend_target(QWindowsIntegrationPlugin CONDITION QT_FEATURE_dynamicgl - SOURCES - qwindowseglcontext.cpp qwindowseglcontext.h + qwindowsopenglcontext.h ) qt_extend_target(QWindowsIntegrationPlugin CONDITION QT_FEATURE_systemtrayicon @@ -228,19 +214,7 @@ qt_extend_target(QWindowsIntegrationPlugin CONDITION QT_FEATURE_accessibility AN Qt::WindowsUIAutomationSupportPrivate ) -qt_extend_target(QWindowsIntegrationPlugin CONDITION QT_FEATURE_accessibility AND mingw +qt_extend_target(QWindowsIntegrationPlugin CONDITION MINGW AND QT_FEATURE_accessibility PUBLIC_LIBRARIES uuid ) - -qt_extend_target(QWindowsIntegrationPlugin CONDITION QT_FEATURE_combined_angle_lib - DEFINES - LIBEGL_NAME= - LIBGLESV2_NAME= -) - -qt_extend_target(QWindowsIntegrationPlugin CONDITION NOT QT_FEATURE_combined_angle_lib - DEFINES - LIBEGL_NAME= - LIBGLESV2_NAME= -) |