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 51042655100b4b46bbc4ff88f83740210337cf14..501da119a85e546138381df89abb15006a874e94 100644 (file)
--- 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 f0eea8452dfdec3368cfb86432d573ec1399929c..52a2f782afc943a06ba06ac9e4a92a2519811321 100644 (file)
--- 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: