[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [kholidays] /: KF5: Remove kdelibs4support dependency
From:       John Layt <jlayt () kde ! org>
Date:       2015-09-02 18:07:28
Message-ID: E1ZXCRU-0003LI-Vw () scm ! kde ! org
[Download RAW message or body]

Git commit 535fe737d373722dcd6c2819a6097a9f60d06243 by John Layt.
Committed on 02/09/2015 at 17:53.
Pushed by jlayt into branch 'master'.

KF5: Remove kdelibs4support dependency

All uses of kdelibs4support have been removed so remove the dependency.

M  +4    -1    CMakeLists.txt
M  +9    -4    src/CMakeLists.txt
M  +3    -6    src/holidayregion.cpp

http://commits.kde.org/kholidays/535fe737d373722dcd6c2819a6097a9f60d06243

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7a73c47..ee628a1 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -27,8 +27,11 @@ ecm_setup_version(${KHOLIDAYS_LIB_VERSION} VARIABLE_PREF=
IX KHOLIDAYS
 )
 =

 ########### Find packages ###########
+find_package(Qt5 ${REQUIRED_QT_VERSION} CONFIG REQUIRED Widgets Test)
 find_package(KF5ItemViews ${KF5_VERSION} CONFIG REQUIRED)
-find_package(KF5KDELibs4Support ${KF5_VERSION} CONFIG REQUIRED)
+find_package(KF5Completion ${KF5_VERSION} CONFIG REQUIRED)
+find_package(KF5I18n ${KF5_VERSION} CONFIG REQUIRED)
+find_package(KF5DesignerPlugin ${KF5_VERSION} CONFIG REQUIRED)
 =

 find_package(Qt5Designer NO_MODULE)
 set_package_properties(Qt5Designer PROPERTIES
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 2754acb..a26e4fe 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -38,9 +38,11 @@ target_include_directories(KF5Holidays PUBLIC "$<BUILD_I=
NTERFACE:${KHolidays_SOU
 =

 target_link_libraries(KF5Holidays
 PUBLIC
-    KF5::KDELibs4Support
-PRIVATE
+    Qt5::Widgets
+    Qt5::Test
     KF5::I18n
+    KF5::ItemViews
+    KF5::Completion
 )
 =

 set_target_properties(KF5Holidays PROPERTIES
@@ -69,6 +71,10 @@ install(TARGETS KF5Holidays EXPORT KF5HolidaysTargets ${=
KF5_INSTALL_TARGETS_DEFA
 if (Qt5Designer_FOUND)
     kf5designerplugin_add_plugin(holidayswidgets kholidays.widgets)
     target_link_libraries(holidayswidgets
+        Qt5::Widgets
+        Qt5::Designer
+        KF5::ItemViews
+        KF5::Completion
         KF5::Holidays
     )
     set_target_properties(holidayswidgets PROPERTIES
@@ -107,7 +113,6 @@ install(FILES
     COMPONENT Devel
 )
 =

+ecm_generate_pri_file(BASE_NAME KHolidays LIB_NAME KF5KHolidays DEPS "widg=
ets" FILENAME_VAR PRI_FILENAME  INCLUDE_INSTALL_DIR ${KDE_INSTALL_INCLUDEDI=
R_KF5}/KHolidays)
 =

-ecm_generate_pri_file(BASE_NAME KHolidays LIB_NAME KF5KHolidays DEPS "KDEL=
ibs4Support" FILENAME_VAR PRI_FILENAME  INCLUDE_INSTALL_DIR ${KDE_INSTALL_I=
NCLUDEDIR_KF5}/KHolidays)
 install(FILES ${PRI_FILENAME} DESTINATION ${ECM_MKSPECS_INSTALL_DIR})
-
diff --git a/src/holidayregion.cpp b/src/holidayregion.cpp
index 67ffc12..b03591d 100644
--- a/src/holidayregion.cpp
+++ b/src/holidayregion.cpp
@@ -25,16 +25,13 @@
 #include "holidayregion.h"
 =

 #include <QtCore/QDateTime>
-#include <QDirIterator>
+#include <QtCore/QDirIterator>
 #include <QtCore/QFile>
-#include <QtCore/QSharedData>
 #include <QtCore/QFileInfo>
+#include <QtCore/QSharedData>
+#include <QtCore/QStandardPaths>
 =

-#include <KStandardDirs>
-#include <KGlobal>
-#include <KLocale>
 #include <KLocalizedString>
-#include <QStandardPaths>
 =

 #include "holiday_p.h"
 #include "parsers/plan2/holidayparserdriverplan_p.h"

[prev in list] [next in list] [prev in thread] [next in thread]