From 633e4e494f31bc02b21c8049424cfb58cfd6e178 Mon Sep 17 00:00:00 2001 From: Brad King Date: Tue, 9 Dec 2025 15:32:28 -0500 Subject: [PATCH] cmake-gui: Remove unused option to link Qt5 windows plugins statically Revert commit 27a73f1613 (cmake-gui: Add build option to use Qt5 windows plugin statically, 2017-11-13, v3.10.0~3^2~1). Our builds on Windows all use Qt 6 now. --- Source/QtDialog/CMakeLists.txt | 8 +------- Source/QtDialog/CMakeSetup.cxx | 7 ------- 2 files changed, 1 insertion(+), 14 deletions(-) diff --git a/Source/QtDialog/CMakeLists.txt b/Source/QtDialog/CMakeLists.txt index b6eb31aea1..c9e0bfeb15 100644 --- a/Source/QtDialog/CMakeLists.txt +++ b/Source/QtDialog/CMakeLists.txt @@ -66,12 +66,6 @@ if(CMake_QT_STATIC_QXcbIntegrationPlugin_LIBRARIES) PROPERTY COMPILE_DEFINITIONS USE_QXcbIntegrationPlugin) endif() -if(CMake_QT_STATIC_QWindowsIntegrationPlugin_LIBRARIES) - list(APPEND CMake_QT_EXTRA_LIBRARIES ${CMake_QT_STATIC_QWindowsIntegrationPlugin_LIBRARIES}) - set_property(SOURCE CMakeSetup.cxx - PROPERTY COMPILE_DEFINITIONS USE_QWindowsIntegrationPlugin) -endif() - # We need to install platform plugin and add qt.conf for Qt5 on Mac and Windows. if(CMake_INSTALL_DEPENDENCIES AND (APPLE OR WIN32) AND NOT COMMAND qt_generate_deploy_app_script) function(_qt_get_plugin_name_with_version target out_var) @@ -124,7 +118,7 @@ if(CMake_INSTALL_DEPENDENCIES AND (APPLE OR WIN32) AND NOT COMMAND qt_generate_d install(FILES "${CMAKE_CURRENT_BINARY_DIR}/qt.conf" DESTINATION "${CMake_INSTALL_APP_DIR_SLASH}Resources" ${COMPONENT}) - elseif(WIN32 AND NOT CMake_QT_STATIC_QWindowsIntegrationPlugin_LIBRARIES) + elseif(WIN32) if(CMake_QT_MAJOR_VERSION VERSION_GREATER_EQUAL 6) # Qt6 provides the plugins as individual packages that need to be found. find_package(Qt${CMake_QT_MAJOR_VERSION}QWindowsIntegrationPlugin QUIET PATHS ${Qt${CMake_QT_MAJOR_VERSION}Gui_DIR}) diff --git a/Source/QtDialog/CMakeSetup.cxx b/Source/QtDialog/CMakeSetup.cxx index 518835923c..e74b871e8a 100644 --- a/Source/QtDialog/CMakeSetup.cxx +++ b/Source/QtDialog/CMakeSetup.cxx @@ -54,13 +54,6 @@ static void cmAddPluginPath(); Q_IMPORT_PLUGIN(QXcbIntegrationPlugin); #endif -#if defined(USE_QWindowsIntegrationPlugin) -Q_IMPORT_PLUGIN(QWindowsIntegrationPlugin); -# if QT_VERSION >= QT_VERSION_CHECK(5, 10, 0) -Q_IMPORT_PLUGIN(QWindowsVistaStylePlugin); -# endif -#endif - int CMakeGUIExec(CMakeSetupDialog* window); void SetupDefaultQSettings(); void OpenReferenceManual(QString const& filename);