Commit f9490f5b authored by Christian Ehrlicher's avatar Christian Ehrlicher

KF5 port: remove KF5::KDELibs4Support

Summary: last patch (only 5, not 7 patches needed) to remove kdelibs4support from frameworks branch

Test Plan: this one removes the last pieces from CMakeLists.txt - only works after the other 4. Still compiles, but now kdelibs4support - free :)

Reviewers: #kde_games, ltoscano

Reviewed By: ltoscano

Subscribers: ltoscano, #kde_games

Differential Revision: https://phabricator.kde.org/D7420
parent 79233335
......@@ -17,7 +17,6 @@ find_package(KF5 ${KF5_MIN_VERSION} REQUIRED COMPONENTS
Crash
I18n
ItemViews
KDELibs4Support
KIO
Notifications
Service
......
project(libpala)
include(GenerateExportHeader)
set(libpala_VERSION "0.2.0")
set(libpala_SOVERSION "0")
......@@ -28,7 +30,7 @@ set(libpala_FANCY_HDRS
add_library(pala SHARED ${libpala_SRCS})
generate_export_header(pala BASE_NAME libpala)
target_link_libraries(pala KF5::KDELibs4Support Qt5::Gui)
target_link_libraries(pala KF5::I18n Qt5::Gui)
set_target_properties(pala PROPERTIES
VERSION ${libpala_VERSION}
SOVERSION ${libpala_SOVERSION}
......
......@@ -10,7 +10,7 @@ install(FILES palapeli_servicemenu.desktop DESTINATION ${KDE_INSTALL_KSERVICES5D
# thumbnail creator plugin
add_library(palathumbcreator MODULE thumbnail-creator.cpp)
target_link_libraries(palathumbcreator KF5::KIOCore KF5::KIOWidgets KF5::Archive KF5::KDELibs4Support)
target_link_libraries(palathumbcreator KF5::KIOCore KF5::KIOWidgets KF5::Archive)
install(TARGETS palathumbcreator DESTINATION ${KDE_INSTALL_PLUGINDIR})
install(FILES palathumbcreator.desktop DESTINATION ${KDE_INSTALL_KSERVICES5DIR})
......@@ -18,7 +18,6 @@
***************************************************************************/
#include <KIO/ThumbCreator>
#include <kdemacros.h>
#include <QImage>
#include <QTemporaryDir>
#include <KTar>
......@@ -34,7 +33,7 @@ namespace Palapeli
extern "C"
{
KDE_EXPORT ThumbCreator* new_creator()
Q_DECL_EXPORT ThumbCreator* new_creator()
{
return new Palapeli::ThumbCreator;
}
......
......@@ -20,7 +20,7 @@ endif(QVORONOI_EXECUTABLE)
#correctly include the headers of libpala when they are not yet installed
set_directory_properties(PROPERTIES COMPILE_DEFINITIONS USE_LOCAL_LIBPALA)
set(SLICER_LINK_LIBS KF5::KDELibs4Support Qt5::Gui pala)
set(SLICER_LINK_LIBS KF5::CoreAddons KF5::I18n Qt5::Gui pala)
add_library(palapeli_rectslicer MODULE slicer-rect.cpp)
target_link_libraries(palapeli_rectslicer ${SLICER_LINK_LIBS})
......
......@@ -20,10 +20,8 @@
#include "slicer-goldberg.h"
#include <QMessageBox>
#include <KLocalizedString>
#include <KPluginFactory>
#include <KPluginLoader>
#include <QDebug>
#include "goldberg-engine.h"
......@@ -31,7 +29,6 @@
#include "utilities.h"
K_PLUGIN_FACTORY(SvgSlicerFactory, registerPlugin<GoldbergSlicer>();)
K_EXPORT_PLUGIN(SvgSlicerFactory("palapeli_goldbergslicer"))
GoldbergSlicer::GoldbergSlicer(QObject* parent, const QVariantList& args)
: Pala::Slicer(parent, args) {
......
......@@ -23,7 +23,6 @@
#include <QPainterPath>
#include <KLocalizedString>
#include <KPluginFactory>
#include <KPluginLoader>
//BEGIN utility functions
......@@ -85,7 +84,6 @@ JigsawPlugParams JigsawPlugParams::mirrored()
}
K_PLUGIN_FACTORY(SvgSlicerFactory, registerPlugin<JigsawSlicer>();)
K_EXPORT_PLUGIN(SvgSlicerFactory("palapeli_jigsawslicer"))
JigsawSlicer::JigsawSlicer(QObject* parent, const QVariantList& args)
: Pala::Slicer(parent, args)
......
......@@ -20,10 +20,8 @@
#include <KLocalizedString>
#include <KPluginFactory>
#include <KPluginLoader>
K_PLUGIN_FACTORY(RectSlicerFactory, registerPlugin<RectSlicer>();)
K_EXPORT_PLUGIN(RectSlicerFactory("palapeli_rectslicer"))
RectSlicer::RectSlicer(QObject* parent, const QVariantList& args)
: Pala::Slicer(parent, args)
......
......@@ -52,9 +52,14 @@ ecm_add_app_icon(palapeli_SRCS ICONS ${ICONS_SRCS})
add_executable(palapeli ${palapeli_SRCS})
target_link_libraries(palapeli
pala
KF5::KDELibs4Support
KF5::Archive
KF5::ConfigWidgets
KF5::Crash
KF5::ItemViews
KF5::Notifications
KF5::KIOWidgets
KF5::WidgetsAddons
KF5::XmlGui
Qt5::Concurrent
Qt5::Svg
)
......
......@@ -21,8 +21,8 @@
#include "propertywidget.h"
#include <QCheckBox>
#include <QSpinBox>
#include <KComboBox>
#include <KIntSpinBox>
#include <KLineEdit>
namespace Palapeli
......
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