Commit a031e3c4 authored by Michael Reeves's avatar Michael Reeves
Browse files

*finally found out what the proper porting was for KFileItemActionPlugin.

*remove unneeded cruft/workaround.
parent a325dffa
...@@ -22,8 +22,6 @@ find_package(KF5 ${KF5_MIN_VERSION} REQUIRED COMPONENTS I18n KDELibs4Support) ...@@ -22,8 +22,6 @@ find_package(KF5 ${KF5_MIN_VERSION} REQUIRED COMPONENTS I18n KDELibs4Support)
SET(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules) SET(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules)
add_definitions(${QT_DEFINITIONS} ${KF5_DEFINITIONS}) add_definitions(${QT_DEFINITIONS} ${KF5_DEFINITIONS})
#dummy define remove on full port to qt5
add_definitions(-DQ_DECL_CONSTRUCTOR_DEPRECATED=Q_DECL_DEPRECATED)
#remove unnneeded errors #remove unnneeded errors
remove_definitions(-DQT_NO_CAST_FROM_ASCII -DQT_STRICT_ITERATORS -DQT_NO_CAST_FROM_BYTEARRAY -DQT_NO_KEYWORDS) remove_definitions(-DQT_NO_CAST_FROM_ASCII -DQT_STRICT_ITERATORS -DQT_NO_CAST_FROM_BYTEARRAY -DQT_NO_KEYWORDS)
......
...@@ -3,7 +3,7 @@ find_package(KF5 ${KF5_MIN_VERSION} REQUIRED COMPONENTS KIO ...@@ -3,7 +3,7 @@ find_package(KF5 ${KF5_MIN_VERSION} REQUIRED COMPONENTS KIO
) )
add_library(kdiff3fileitemaction MODULE kdiff3fileitemaction.cpp) add_library(kdiff3fileitemaction MODULE kdiff3fileitemaction.cpp)
target_link_libraries(kdiff3fileitemaction KF5::WidgetsAddons KF5::KIOWidgets KF5::KIOCore ${LibKDiff3_LIBRARIES}) target_link_libraries(kdiff3fileitemaction KF5::WidgetsAddons KF5::KIOWidgets ${LibKDiff3_LIBRARIES})
install(TARGETS kdiff3fileitemaction DESTINATION ${PLUGIN_INSTALL_DIR}) install(TARGETS kdiff3fileitemaction DESTINATION ${PLUGIN_INSTALL_DIR})
install(FILES kdiff3fileitemaction.desktop DESTINATION ${SERVICES_INSTALL_DIR}) install(FILES kdiff3fileitemaction.desktop DESTINATION ${SERVICES_INSTALL_DIR})
...@@ -24,7 +24,9 @@ ...@@ -24,7 +24,9 @@
#include <QAction> #include <QAction>
#include <QMenu> #include <QMenu>
#include <klocale.h> #include <klocale.h>
#include <kgenericfactory.h>//FIXME:Port to non-broken header.
#include <KPluginFactory>
#include <KPluginLoader>
#include <kurl.h> #include <kurl.h>
#include <kconfig.h> #include <kconfig.h>
#include <kconfiggroup.h> #include <kconfiggroup.h>
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment