The branch, killqt4, has been updated.
- Log -----------------------------------------------------------------
commit 431379615e41247627483c90c3dc17a75ba706de
Author: Kornel Benko <kor...@lyx.org>
Date: Tue Nov 22 18:48:46 2022 +0100
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 5104265..501da11 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 f0eea84..52a2f78 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:
-----------------------------------------------------------------------
Summary of changes:
development/cmake/modules/LyXMacros.cmake | 4 ----
development/cmake/post_install/CMakeLists.txt | 4 ----
2 files changed, 0 insertions(+), 8 deletions(-)
hooks/post-receive
--
Repository for new features
--
lyx-cvs mailing list
lyx-cvs@lists.lyx.org
http://lists.lyx.org/mailman/listinfo/lyx-cvs
