From: Kornel Benko Date: Tue, 22 Nov 2022 17:48:46 +0000 (+0100) Subject: Amend(4) 580dea63: get rid of Qt4 code also in cmake build X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=431379615e41247627483c90c3dc17a75ba706de;p=features.git Amend(4) 580dea63: get rid of Qt4 code also in cmake build --- diff --git a/development/cmake/modules/LyXMacros.cmake b/development/cmake/modules/LyXMacros.cmake index 5104265510..501da119a8 100644 --- a/development/cmake/modules/LyXMacros.cmake +++ b/development/cmake/modules/LyXMacros.cmake @@ -62,10 +62,6 @@ endmacro(LYX_ADD_UI_FILES) macro(LYX_AUTOMOC) - if (QT4_GET_MOC_INC_DIRS) - QT4_GET_MOC_INC_DIRS(_moc_INCS) - endif() - set(_matching_FILES) foreach (_current_FILE ${ARGN}) diff --git a/development/cmake/post_install/CMakeLists.txt b/development/cmake/post_install/CMakeLists.txt index f0eea8452d..52a2f782af 100644 --- a/development/cmake/post_install/CMakeLists.txt +++ b/development/cmake/post_install/CMakeLists.txt @@ -36,10 +36,6 @@ if(LYX_BUNDLE) endif() install_qt_plugin("Qt5::QCocoaIntegrationPlugin") endif() - else() - # With QT4, just copy all the plugins - file(GLOB QT_PLUGIN_DIRECTORIES "${QT_PLUGINS_DIR}/*") - install(DIRECTORY ${QT_PLUGIN_DIRECTORIES} DESTINATION "${qtplugin_dest_dir}/plugins/" COMPONENT Runtime) endif() # Install code does the following: