You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
144 lines
5.6 KiB
144 lines
5.6 KiB
From 720711e3a4e69bcc6447c928bea243a81a777a07 Mon Sep 17 00:00:00 2001
|
|
From: Andreas Sturmlechner <asturm@gentoo.org>
|
|
Date: Sun, 22 Nov 2020 00:25:06 +0100
|
|
Subject: [PATCH 1/2] Drop KDE4_ADD_WIDGET_FILES macro and KF5DesignerPlugin
|
|
dependency
|
|
|
|
Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
|
|
---
|
|
CMakeLists.txt | 1 -
|
|
KF5KDELibs4SupportConfig.cmake.in | 1 -
|
|
cmake/modules/FindKDE4Internal.cmake | 4 ----
|
|
cmake/modules/KDE4Macros.cmake | 2 --
|
|
src/CMakeLists.txt | 19 -------------------
|
|
src/KDEUIMacros.cmake | 25 -------------------------
|
|
6 files changed, 52 deletions(-)
|
|
|
|
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
|
index a60c88a4..2a432591 100644
|
|
--- a/CMakeLists.txt
|
|
+++ b/CMakeLists.txt
|
|
@@ -26,7 +26,6 @@ find_package(KF5Completion ${KF_DEP_VERSION} REQUIRED)
|
|
find_package(KF5Config ${KF_DEP_VERSION} REQUIRED)
|
|
find_package(KF5ConfigWidgets ${KF_DEP_VERSION} REQUIRED)
|
|
find_package(KF5Crash ${KF_DEP_VERSION} REQUIRED)
|
|
-find_package(KF5DesignerPlugin ${KF_DEP_VERSION} REQUIRED)
|
|
find_package(KF5GlobalAccel ${KF_DEP_VERSION} REQUIRED)
|
|
find_package(KF5DocTools ${KF_DEP_VERSION} REQUIRED)
|
|
find_package(KF5Emoticons ${KF_DEP_VERSION} REQUIRED)
|
|
diff --git a/KF5KDELibs4SupportConfig.cmake.in b/KF5KDELibs4SupportConfig.cmake.in
|
|
index 3de7d530..4fe2369e 100644
|
|
--- a/KF5KDELibs4SupportConfig.cmake.in
|
|
+++ b/KF5KDELibs4SupportConfig.cmake.in
|
|
@@ -11,7 +11,6 @@ find_dependency(KF5Archive "@KF_DEP_VERSION@")
|
|
find_dependency(KF5ConfigWidgets "@KF_DEP_VERSION@")
|
|
find_dependency(KF5CoreAddons "@KF_DEP_VERSION@")
|
|
find_dependency(KF5Crash "@KF_DEP_VERSION@")
|
|
-find_dependency(KF5DesignerPlugin "@KF_DEP_VERSION@")
|
|
find_dependency(KF5DocTools "@KF_DEP_VERSION@")
|
|
find_dependency(KF5Emoticons "@KF_DEP_VERSION@")
|
|
find_dependency(KF5GuiAddons "@KF_DEP_VERSION@")
|
|
diff --git a/cmake/modules/FindKDE4Internal.cmake b/cmake/modules/FindKDE4Internal.cmake
|
|
index 7e252a70..b9636036 100644
|
|
--- a/cmake/modules/FindKDE4Internal.cmake
|
|
+++ b/cmake/modules/FindKDE4Internal.cmake
|
|
@@ -179,10 +179,6 @@
|
|
# Use optional USE_RELATIVE_PATH to generate the classes in the build following the given
|
|
# relative path to the file.
|
|
#
|
|
-# KDE4_ADD_WIDGET_FILES (SRCS_VAR file1.widgets ... fileN.widgets)
|
|
-# Use this to add widget description files for the makekdewidgets code generator
|
|
-# for Qt Designer plugins.
|
|
-#
|
|
# KDE4_ADD_PLUGIN ( name [WITH_PREFIX] file1 ... fileN )
|
|
# Create a KDE plugin (KPart, kioslave, etc.) from the given source files.
|
|
# If WITH_PREFIX is given, the resulting plugin will have the prefix "lib", otherwise it won't.
|
|
diff --git a/cmake/modules/KDE4Macros.cmake b/cmake/modules/KDE4Macros.cmake
|
|
index ca868ad9..27bb28f9 100644
|
|
--- a/cmake/modules/KDE4Macros.cmake
|
|
+++ b/cmake/modules/KDE4Macros.cmake
|
|
@@ -10,7 +10,6 @@
|
|
# KDE4_ADD_KDEINIT_EXECUTABLE
|
|
# KDE4_ADD_UNIT_TEST
|
|
# KDE4_ADD_EXECUTABLE
|
|
-# KDE4_ADD_WIDGET_FILES
|
|
# KDE4_UPDATE_ICONCACHE
|
|
# KDE4_INSTALL_ICONS
|
|
# KDE4_REMOVE_OBSOLETE_CMAKE_FILES
|
|
@@ -486,7 +485,6 @@ include("${KF5Auth_DIR}/KF5AuthMacros.cmake")
|
|
include("${CMAKE_CURRENT_LIST_DIR}/KDECoreMacros.cmake")
|
|
include("${CMAKE_CURRENT_LIST_DIR}/KDEUIMacros.cmake")
|
|
include("${KF5DocTools_DIR}/KF5DocToolsMacros.cmake")
|
|
-include("${KF5DesignerPlugin_DIR}/KF5DesignerPluginMacros.cmake")
|
|
|
|
# functions deprecated, they still should work
|
|
macro (KDE4_AUTH_INSTALL_ACTIONS)
|
|
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
|
|
index cb8a3c2d..70829dd6 100644
|
|
--- a/src/CMakeLists.txt
|
|
+++ b/src/CMakeLists.txt
|
|
@@ -371,25 +371,6 @@ set_target_properties(KF5KDELibs4Support PROPERTIES
|
|
)
|
|
|
|
|
|
-########## Designer plugin
|
|
-
|
|
-kf5designerplugin_add_plugin(kf5deprecatedwidgets
|
|
- kdedeprecated.widgets
|
|
- kdedeprecated.qrc
|
|
- classpreviews.cpp
|
|
-)
|
|
-
|
|
-target_link_libraries(kf5deprecatedwidgets KF5::KDELibs4Support
|
|
- Qt5::Widgets
|
|
- Qt5::Designer
|
|
- KF5::ConfigCore
|
|
- KF5::Completion
|
|
- KF5::WidgetsAddons
|
|
- KF5::Auth
|
|
- )
|
|
-
|
|
-install(TARGETS kf5deprecatedwidgets DESTINATION ${KDE_INSTALL_QTPLUGINDIR}/designer)
|
|
-
|
|
##########
|
|
|
|
add_subdirectory(pics)
|
|
diff --git a/src/KDEUIMacros.cmake b/src/KDEUIMacros.cmake
|
|
index 1570df34..e255960d 100644
|
|
--- a/src/KDEUIMacros.cmake
|
|
+++ b/src/KDEUIMacros.cmake
|
|
@@ -163,31 +163,6 @@ macro (KDE4_INSTALL_ICONS _defaultpath )
|
|
endmacro (KDE4_INSTALL_ICONS)
|
|
|
|
|
|
-set(KDEWIDGETS_MAKEKDEWIDGETS_EXECUTABLE ${KF5DESIGNERPLUGIN_GENERATOR_EXECUTABLE})
|
|
-set(_KDE4_MAKEKDEWIDGETS_DEP ${_KF5DESIGNERPLUGIN_GENERATOR_EXECUTABLE_DEP})
|
|
-macro (KDE4_ADD_WIDGET_FILES _sources)
|
|
- foreach (_current_FILE ${ARGN})
|
|
-
|
|
- get_filename_component(_input ${_current_FILE} ABSOLUTE)
|
|
- get_filename_component(_basename ${_input} NAME_WE)
|
|
- set(_source ${CMAKE_CURRENT_BINARY_DIR}/${_basename}widgets.cpp)
|
|
- set(_moc ${CMAKE_CURRENT_BINARY_DIR}/${_basename}widgets.moc)
|
|
-
|
|
- # create source file from the .widgets file
|
|
- add_custom_command(OUTPUT ${_source}
|
|
- COMMAND ${KDEWIDGETS_MAKEKDEWIDGETS_EXECUTABLE}
|
|
- ARGS -o ${_source} ${_input}
|
|
- MAIN_DEPENDENCY ${_input} DEPENDS ${_KDE4_MAKEKDEWIDGETS_DEP})
|
|
-
|
|
- # create moc file
|
|
- qt5_generate_moc(${_source} ${_moc} )
|
|
-
|
|
- list(APPEND ${_sources} ${_source} ${_moc})
|
|
-
|
|
- endforeach (_current_FILE)
|
|
-
|
|
-endmacro (KDE4_ADD_WIDGET_FILES)
|
|
-
|
|
# adds application icon to target source list
|
|
# 'appsources' - the sources of the application
|
|
# 'pngfiles' - specifies the list of icon files
|
|
--
|
|
2.30.0
|