summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVolker Krause <[email protected]>2015-08-16 11:00:26 +0200
committerVolker Krause <[email protected]>2015-08-16 11:00:35 +0200
commit1e32c55ead5919b4d403a1a23463b1505d827141 (patch)
treeccaf5380cee402cae56e7157760ab46f293332c5
parent8f9b8d49b8af2d74fa041382fbeee8ebe6d20477 (diff)
Remove KDELibs4Support from the public link interface of libkdepim.
-rw-r--r--agents/notesagent/CMakeLists.txt1
-rw-r--r--agents/sendlateragent/autotests/CMakeLists.txt2
-rw-r--r--akregator/CMakeLists.txt1
-rw-r--r--akregator/configuration/CMakeLists.txt4
-rw-r--r--akregator/plugins/mk4storage/CMakeLists.txt1
-rw-r--r--akregator/src/CMakeLists.txt4
-rw-r--r--grantleeeditor/contactprintthemeeditor/themeeditormainwindow.cpp2
-rw-r--r--grantleeeditor/contactthemeeditor/contacteditormainwindow.cpp2
-rw-r--r--grantleeeditor/grantleethemeeditor/CMakeLists.txt2
-rw-r--r--kaddressbook/CMakeLists.txt1
-rw-r--r--kmail/CMakeLists.txt1
-rw-r--r--kmail/kontactplugin/CMakeLists.txt2
-rw-r--r--kmail/mailmerge/autotests/CMakeLists.txt1
-rw-r--r--kmail/mailmerge/tests/CMakeLists.txt1
-rw-r--r--knotes/CMakeLists.txt4
-rw-r--r--kontact/plugins/summary/CMakeLists.txt2
-rw-r--r--kontact/src/CMakeLists.txt2
-rw-r--r--kontact/src/kontactconfiguredialog.h2
-rw-r--r--kontact/src/mainwindow.cpp2
-rw-r--r--libkdepim/CMakeLists.txt18
-rw-r--r--libkdepim/addressline/autotests/CMakeLists.txt2
-rw-r--r--libksieve/ksieveui/CMakeLists.txt2
-rw-r--r--messagelist/CMakeLists.txt3
-rw-r--r--noteshared/CMakeLists.txt2
-rw-r--r--pimcommon/CMakeLists.txt4
-rw-r--r--sieveeditor/CMakeLists.txt3
-rw-r--r--storageservicemanager/CMakeLists.txt2
27 files changed, 50 insertions, 23 deletions
diff --git a/agents/notesagent/CMakeLists.txt b/agents/notesagent/CMakeLists.txt
index 3dd0eb5..71e0801 100644
--- a/agents/notesagent/CMakeLists.txt
+++ b/agents/notesagent/CMakeLists.txt
@@ -26,6 +26,7 @@ target_link_libraries(akonadi_notes_agent
KF5::AkonadiAgentBase
KF5::NotifyConfig
KF5::DBusAddons
+ KF5::KDELibs4Support
noteshared
pimcommon
)
diff --git a/agents/sendlateragent/autotests/CMakeLists.txt b/agents/sendlateragent/autotests/CMakeLists.txt
index c1c7827..568fe99 100644
--- a/agents/sendlateragent/autotests/CMakeLists.txt
+++ b/agents/sendlateragent/autotests/CMakeLists.txt
@@ -8,7 +8,7 @@ macro(add_sendlater_agent_test _source )
ecm_add_test(${_test}
TEST_NAME ${_name}
NAME_PREFIX "sendlateragent-"
- LINK_LIBRARIES Qt5::Test KF5::AkonadiCore sendlater pimcommon
+ LINK_LIBRARIES Qt5::Test KF5::XmlGui KF5::AkonadiCore sendlater pimcommon
)
endmacro()
diff --git a/akregator/CMakeLists.txt b/akregator/CMakeLists.txt
index bc63e83..23b5839 100644
--- a/akregator/CMakeLists.txt
+++ b/akregator/CMakeLists.txt
@@ -1,3 +1,4 @@
+project(akregator)
include(CheckTypeSize)
check_type_size("long" SIZEOF_LONG)
configure_file(config-akregator.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-akregator.h)
diff --git a/akregator/configuration/CMakeLists.txt b/akregator/configuration/CMakeLists.txt
index 9532460..b063bc2 100644
--- a/akregator/configuration/CMakeLists.txt
+++ b/akregator/configuration/CMakeLists.txt
@@ -14,6 +14,7 @@ add_library(akregator_config_general MODULE ${kcm_akrgeneralconfig_SRCS})
target_link_libraries(akregator_config_general
akregatorinterfaces
KF5::KIOCore
+ KF5::TextWidgets
)
install(FILES akregator_config_general.desktop DESTINATION ${KDE_INSTALL_KSERVICES5DIR})
@@ -30,6 +31,7 @@ add_library(akregator_config_appearance MODULE ${kcm_akrappearanceconfig_SRCS})
target_link_libraries(akregator_config_appearance
akregatorinterfaces
KF5::KIOCore
+ KF5::TextWidgets
)
kcoreaddons_desktop_to_json(akregator_config_appearance akregator_config_appearance.desktop)
@@ -46,6 +48,7 @@ add_library(akregator_config_archive MODULE ${kcm_akrarchiveconfig_SRCS})
target_link_libraries(akregator_config_archive
akregatorinterfaces
KF5::KIOCore
+ KF5::TextWidgets
)
#kcoreaddons_desktop_to_json(akregator_config_archive akregator_config_archive.desktop)
install(FILES akregator_config_archive.desktop DESTINATION ${KDE_INSTALL_KSERVICES5DIR})
@@ -80,6 +83,7 @@ add_library(akregator_config_advanced MODULE ${kcm_akradvancedconfig_SRCS})
target_link_libraries(akregator_config_advanced
akregatorinterfaces
KF5::KIOCore
+ KF5::TextWidgets
)
kcoreaddons_desktop_to_json(akregator_config_advanced akregator_config_advanced.desktop)
diff --git a/akregator/plugins/mk4storage/CMakeLists.txt b/akregator/plugins/mk4storage/CMakeLists.txt
index 19e2ec7..b2fc58f 100644
--- a/akregator/plugins/mk4storage/CMakeLists.txt
+++ b/akregator/plugins/mk4storage/CMakeLists.txt
@@ -42,6 +42,7 @@ target_link_libraries(akregator_mk4storage_plugin
KF5::Syndication
akregatorinterfaces
+ KF5::KDELibs4Support
)
install(TARGETS akregator_mk4storage_plugin DESTINATION ${KDE_INSTALL_PLUGINDIR})
diff --git a/akregator/src/CMakeLists.txt b/akregator/src/CMakeLists.txt
index b7c8691..66b2bd8 100644
--- a/akregator/src/CMakeLists.txt
+++ b/akregator/src/CMakeLists.txt
@@ -14,6 +14,7 @@ ecm_add_app_icon(akregator_SRCS ICONS ${ICONS_AKREGATOR_SRCS})
add_executable(akregator ${akregator_SRCS})
target_link_libraries(akregator
+ KF5::Notifications
KF5::KontactInterface
kdepim
akregatorprivate
@@ -60,6 +61,8 @@ target_link_libraries(akregatorprivate
PUBLIC
KF5::KHtml
PRIVATE
+ KF5::Notifications
+ KF5::KDELibs4Support
kdepim
KF5::Syndication
akregatorinterfaces
@@ -126,6 +129,7 @@ ki18n_wrap_ui(akregatorpart_PART_SRCS
add_library(akregatorpart MODULE ${akregatorpart_PART_SRCS})
generate_export_header(akregatorpart BASE_NAME akregatorpart)
target_link_libraries(akregatorpart
+ KF5::KDELibs4Support
akregatorinterfaces
akregatorprivate
KF5::KCMUtils
diff --git a/grantleeeditor/contactprintthemeeditor/themeeditormainwindow.cpp b/grantleeeditor/contactprintthemeeditor/themeeditormainwindow.cpp
index fea6ccb..b46592f 100644
--- a/grantleeeditor/contactprintthemeeditor/themeeditormainwindow.cpp
+++ b/grantleeeditor/contactprintthemeeditor/themeeditormainwindow.cpp
@@ -29,7 +29,7 @@
#include <KMessageBox>
#include <QFileDialog>
#include <KRecentFilesAction>
-#include <KNS3/KNewStuffAction>
+#include <kns3/knewstuffaction.h>
#include <KConfigGroup>
#include <QApplication>
diff --git a/grantleeeditor/contactthemeeditor/contacteditormainwindow.cpp b/grantleeeditor/contactthemeeditor/contacteditormainwindow.cpp
index 3b3cdea..80e408e 100644
--- a/grantleeeditor/contactthemeeditor/contacteditormainwindow.cpp
+++ b/grantleeeditor/contactthemeeditor/contacteditormainwindow.cpp
@@ -31,7 +31,7 @@
#include <KRecentFilesAction>
#include <KConfigGroup>
-#include <KNS3/KNewStuffAction>
+#include <kns3/knewstuffaction.h>
#include <QPointer>
#include <QCloseEvent>
diff --git a/grantleeeditor/grantleethemeeditor/CMakeLists.txt b/grantleeeditor/grantleethemeeditor/CMakeLists.txt
index e175b51..66df9d4 100644
--- a/grantleeeditor/grantleethemeeditor/CMakeLists.txt
+++ b/grantleeeditor/grantleethemeeditor/CMakeLists.txt
@@ -31,7 +31,7 @@ generate_export_header(grantleethemeeditor BASE_NAME grantleethemeeditor)
target_include_directories(grantleethemeeditor PUBLIC "$<BUILD_INTERFACE:${grantleeditor_SOURCE_DIR};${grantleethemeeditor_SOURCE_DIR};${grantleethemeeditor_BINAY_DIR}>")
-target_link_libraries(grantleethemeeditor KF5::Archive KF5::PimTextEdit pimcommon)
+target_link_libraries(grantleethemeeditor KF5::Archive KF5::KIOWidgets KF5::PimTextEdit pimcommon)
set_target_properties(grantleethemeeditor PROPERTIES VERSION ${KDEPIM_LIB_VERSION} SOVERSION ${KDEPIM_LIB_SOVERSION})
install(TARGETS grantleethemeeditor ${KDE_INSTALL_TARGETS_DEFAULT_ARGS})
diff --git a/kaddressbook/CMakeLists.txt b/kaddressbook/CMakeLists.txt
index 2eb899e..937f6d0 100644
--- a/kaddressbook/CMakeLists.txt
+++ b/kaddressbook/CMakeLists.txt
@@ -140,6 +140,7 @@ target_link_libraries(kaddressbookprivate
KF5::Codecs
grantleetheme
KF5::Gpgmepp
+ KF5::KDELibs4Support
)
if (BUILD_TESTING)
add_subdirectory(merge/autotests)
diff --git a/kmail/CMakeLists.txt b/kmail/CMakeLists.txt
index a999286..0b1cf7a 100644
--- a/kmail/CMakeLists.txt
+++ b/kmail/CMakeLists.txt
@@ -334,6 +334,7 @@ if (KDEPIM_BUILD_DESKTOP)
pimcommon
KF5::KCMUtils
KF5::Parts
+ KF5::IconThemes
)
########### KMail executable ###############
diff --git a/kmail/kontactplugin/CMakeLists.txt b/kmail/kontactplugin/CMakeLists.txt
index 65836af..199b218 100644
--- a/kmail/kontactplugin/CMakeLists.txt
+++ b/kmail/kontactplugin/CMakeLists.txt
@@ -24,7 +24,7 @@ set(kcm_kmailsummary_PART_SRCS kmailplugin_debug.cpp kcmkmailsummary.cpp ${konta
add_library(kcm_kmailsummary MODULE ${kcm_kmailsummary_PART_SRCS})
add_dependencies(kcm_kmailsummary kmail_xml)
-target_link_libraries(kcm_kmailsummary KF5::Mime pimcommon)
+target_link_libraries(kcm_kmailsummary KF5::Mime pimcommon Qt5::DBus)
########### install files ###############
diff --git a/kmail/mailmerge/autotests/CMakeLists.txt b/kmail/mailmerge/autotests/CMakeLists.txt
index e49bd97..2484f44 100644
--- a/kmail/mailmerge/autotests/CMakeLists.txt
+++ b/kmail/mailmerge/autotests/CMakeLists.txt
@@ -13,6 +13,7 @@ macro(add_kmail_unittest _source _additionalsource)
pimcommon
Qt5::Test
KF5::KIOCore
+ KF5::KIOWidgets
)
endmacro ()
diff --git a/kmail/mailmerge/tests/CMakeLists.txt b/kmail/mailmerge/tests/CMakeLists.txt
index a14fbbf..495fe4b 100644
--- a/kmail/mailmerge/tests/CMakeLists.txt
+++ b/kmail/mailmerge/tests/CMakeLists.txt
@@ -5,6 +5,7 @@ set(mailmergewidget_gui_SRCS mailmergewidgettest_gui.cpp ../widgets/mailmergewid
add_executable(mailmergewidget_gui ${mailmergewidget_gui_SRCS})
target_link_libraries(mailmergewidget_gui
KF5::KIOCore
+ KF5::KIOWidgets
pimcommon
)
diff --git a/knotes/CMakeLists.txt b/knotes/CMakeLists.txt
index cfc41f2..8564d5a 100644
--- a/knotes/CMakeLists.txt
+++ b/knotes/CMakeLists.txt
@@ -43,7 +43,7 @@ kconfig_add_kcfg_files(libknotesprivate_kcfg_lib_SRCS ${libknotesprivate_kcfg_li
add_library(knotesprivate ${libknotesprivate_lib_SRCS} ${libknotesprivate_kcfg_lib_SRCS} )
generate_export_header(knotesprivate BASE_NAME knotes)
-target_link_libraries(knotesprivate pimcommon KF5::KCMUtils Grantlee5::Templates KF5::NewStuff noteshared KF5::AkonadiSearchPIM KF5::AkonadiNotes)
+target_link_libraries(knotesprivate pimcommon KF5::KCMUtils Grantlee5::Templates KF5::NewStuff KF5::WindowSystem KF5::IconThemes Qt5::PrintSupport KF5::KDELibs4Support noteshared KF5::AkonadiSearchPIM KF5::AkonadiNotes)
set_target_properties(knotesprivate
PROPERTIES VERSION ${KDEPIM_LIB_VERSION} SOVERSION ${KDEPIM_LIB_SOVERSION}
)
@@ -90,7 +90,7 @@ set(kcm_knotes_PART_SRCS configdialog/knoteconfigdialog.cpp configdialog/knotedi
add_library(kcm_knote MODULE ${kcm_knotes_PART_SRCS} )
-target_link_libraries(kcm_knote knotesprivate KF5::AkonadiCore KF5::KCMUtils KF5::NewStuff noteshared KF5::AkonadiNotes pimcommon)
+target_link_libraries(kcm_knote knotesprivate KF5::AkonadiCore KF5::KCMUtils KF5::NewStuff KF5::WindowSystem noteshared KF5::AkonadiNotes pimcommon)
install(TARGETS kcm_knote DESTINATION ${KDE_INSTALL_PLUGINDIR})
diff --git a/kontact/plugins/summary/CMakeLists.txt b/kontact/plugins/summary/CMakeLists.txt
index e67084d..efb225d 100644
--- a/kontact/plugins/summary/CMakeLists.txt
+++ b/kontact/plugins/summary/CMakeLists.txt
@@ -9,7 +9,7 @@ qt5_add_dbus_interfaces(kontact_summaryplugin_PART_SRCS ${CMAKE_BINARY_DIR}/kmai
add_library(kontact_summaryplugin MODULE ${kontact_summaryplugin_PART_SRCS})
add_dependencies(kontact_summaryplugin kmail_xml)
-target_link_libraries(kontact_summaryplugin KF5::KCMUtils KF5::IdentityManagement KF5::KontactInterface kdepim)
+target_link_libraries(kontact_summaryplugin KF5::KCMUtils KF5::IdentityManagement KF5::KontactInterface kdepim KF5::KDELibs4Support)
########### next target ###############
diff --git a/kontact/src/CMakeLists.txt b/kontact/src/CMakeLists.txt
index 03b9e45..0614574 100644
--- a/kontact/src/CMakeLists.txt
+++ b/kontact/src/CMakeLists.txt
@@ -25,6 +25,8 @@ target_link_libraries(kontactprivate
KF5::KCMUtils
KF5::WebKit
KF5::KontactInterface
+ KF5::IconThemes
+ KF5::WindowSystem
kdepim
)
diff --git a/kontact/src/kontactconfiguredialog.h b/kontact/src/kontactconfiguredialog.h
index eae89c2..c5781f2 100644
--- a/kontact/src/kontactconfiguredialog.h
+++ b/kontact/src/kontactconfiguredialog.h
@@ -18,7 +18,7 @@
#ifndef KONTACTCONFIGUREDIALOG_H
#define KONTACTCONFIGUREDIALOG_H
-#include <KSettings/Dialog>
+#include <ksettings/Dialog>
namespace Kontact
{
diff --git a/kontact/src/mainwindow.cpp b/kontact/src/mainwindow.cpp
index 14d71dd..a479349 100644
--- a/kontact/src/mainwindow.cpp
+++ b/kontact/src/mainwindow.cpp
@@ -57,7 +57,7 @@ using namespace Kontact;
#include <KStandardAction>
#include <KToolBar>
#include <KParts/PartManager>
-#include <KSettings/Dispatcher>
+#include <ksettings/Dispatcher>
#include <KSycoca>
#include <KIconLoader>
#include <KLocalizedString>
diff --git a/libkdepim/CMakeLists.txt b/libkdepim/CMakeLists.txt
index 2286289..983250c 100644
--- a/libkdepim/CMakeLists.txt
+++ b/libkdepim/CMakeLists.txt
@@ -140,27 +140,22 @@ add_library(kdepim ${kdepim_LIB_SRCS})
generate_export_header(kdepim BASE_NAME kdepim)
target_link_libraries(kdepim
+ PUBLIC
KF5::Contacts
KF5::Codecs
+ KF5::Completion
+ KF5::I18n
+ KF5::ItemViews
KF5::Ldap
KF5::KCMUtils
KF5::Mime
KF5::AkonadiCore
KF5::AkonadiContact
KF5::AkonadiWidgets
- KF5::AkonadiCalendar
KF5::KCMUtils
KF5::AkonadiSearchPIM
KF5::Wallet
-)
-
-
-target_link_libraries(kdepim LINK_INTERFACE_LIBRARIES
- KF5::Contacts
- KF5::Codecs
- KF5::Ldap
- KF5::AkonadiCore
- KF5::AkonadiContact
+ PRIVATE
KF5::AkonadiCalendar
)
@@ -182,6 +177,7 @@ if (Qt5Designer_FOUND)
target_link_libraries(kdepimwidgets
kdepim
+ KF5::KDELibs4Support
)
if(NOT WIN32)
# Since there are no libraries provided by this module,
@@ -210,7 +206,7 @@ set( kcm_ldap_SRCS
add_library(kcm_ldap MODULE ${kcm_ldap_SRCS})
-target_link_libraries(kcm_ldap kdepim)
+target_link_libraries(kcm_ldap kdepim KF5::IconThemes)
kcoreaddons_desktop_to_json(kcm_ldap ldap/kcmldap.desktop)
diff --git a/libkdepim/addressline/autotests/CMakeLists.txt b/libkdepim/addressline/autotests/CMakeLists.txt
index 37ba3fe..54e471f 100644
--- a/libkdepim/addressline/autotests/CMakeLists.txt
+++ b/libkdepim/addressline/autotests/CMakeLists.txt
@@ -2,7 +2,7 @@ macro(add_libkdepim_addressline_unittest _name)
ecm_add_test(${ARGN}
TEST_NAME ${_name}
NAME_PREFIX "libkdepim-addressline-"
- LINK_LIBRARIES Qt5::Test KF5::Contacts Qt5::Widgets kdepim
+ LINK_LIBRARIES Qt5::Test KF5::Contacts Qt5::Widgets kdepim Qt5::DBus
)
endmacro()
diff --git a/libksieve/ksieveui/CMakeLists.txt b/libksieve/ksieveui/CMakeLists.txt
index 3d6cf54..eee470a 100644
--- a/libksieve/ksieveui/CMakeLists.txt
+++ b/libksieve/ksieveui/CMakeLists.txt
@@ -197,10 +197,12 @@ PRIVATE
KF5::Archive
KF5::AkonadiCore
KF5::Mime
+ KF5::IconThemes
KF5::IdentityManagement
KF5::MailTransport
KF5::KIOWidgets
KF5::NewStuff
+ KF5::WindowSystem
Qt5::WebKitWidgets
KF5::PimTextEdit
)
diff --git a/messagelist/CMakeLists.txt b/messagelist/CMakeLists.txt
index e058990..ce39031 100644
--- a/messagelist/CMakeLists.txt
+++ b/messagelist/CMakeLists.txt
@@ -87,6 +87,7 @@ kconfig_add_kcfg_files(libmessagelist_SRCS USE_RELATIVE_PATH
add_library(messagelist ${libmessagelist_SRCS})
generate_export_header(messagelist BASE_NAME messagelist)
target_link_libraries(messagelist
+ PUBLIC
KF5::KIOCore
KF5::AkonadiCore
KF5::AkonadiMime
@@ -94,6 +95,8 @@ target_link_libraries(messagelist
KF5::AkonadiSearchPIM
messagecore
pimcommon
+ PRIVATE
+ KF5::KDELibs4Support
)
target_include_directories(messagelist PUBLIC "$<BUILD_INTERFACE:${messagelist_SOURCE_DIR};${messagelist_BINARY_DIR}>")
diff --git a/noteshared/CMakeLists.txt b/noteshared/CMakeLists.txt
index 8dade16..be75062 100644
--- a/noteshared/CMakeLists.txt
+++ b/noteshared/CMakeLists.txt
@@ -66,7 +66,7 @@ target_link_libraries(noteshared
PUBLIC
KF5::AkonadiCore
PRIVATE
- KF5::DNSSD pimcommon KF5::Mime KF5::AkonadiNotes
+ KF5::DNSSD pimcommon KF5::Mime KF5::AkonadiNotes KF5::KDELibs4Support
)
target_include_directories(noteshared PUBLIC "$<BUILD_INTERFACE:${noteshared_SOURCE_DIR};${noteshared_BINARY_DIR}>")
diff --git a/pimcommon/CMakeLists.txt b/pimcommon/CMakeLists.txt
index 03aa9f2..6e74469 100644
--- a/pimcommon/CMakeLists.txt
+++ b/pimcommon/CMakeLists.txt
@@ -299,6 +299,8 @@ PUBLIC
kdepim
KF5::IMAP
KF5::AkonadiWidgets
+ KF5::TextWidgets
+ KF5::KIOCore
Qt5::WebKitWidgets
PRIVATE
KF5::Archive
@@ -308,6 +310,7 @@ PRIVATE
KF5::SonnetCore
KF5::Wallet
KF5::DBusAddons
+ KF5::KDELibs4Support
)
target_include_directories(pimcommon PUBLIC "$<BUILD_INTERFACE:${pimcommon_SOURCE_DIR};${pimcommon_BINARY_DIR}>")
@@ -362,6 +365,7 @@ if (Qt5Designer_FOUND)
kf5designerplugin_add_plugin(pimcommonwidgets ${CMAKE_CURRENT_SOURCE_DIR}/designer/pimcommon.widgets)
target_link_libraries(pimcommonwidgets
pimcommon
+ KF5::KDELibs4Support
)
if(NOT WIN32)
# Since there are no libraries provided by this module,
diff --git a/sieveeditor/CMakeLists.txt b/sieveeditor/CMakeLists.txt
index 0bce00b..c235d43 100644
--- a/sieveeditor/CMakeLists.txt
+++ b/sieveeditor/CMakeLists.txt
@@ -41,8 +41,11 @@ ki18n_wrap_ui(sieveeditor_SRCS
add_executable(sieveeditor ${sieveeditor_SRCS} )
target_link_libraries(sieveeditor
KF5::MailTransport
+ KF5::Bookmarks
KF5::DBusAddons
KF5::I18n
+ KF5::IconThemes
+ KF5::XmlGui
pimcommon
ksieveui
kmanagesieve
diff --git a/storageservicemanager/CMakeLists.txt b/storageservicemanager/CMakeLists.txt
index d1095c0..5456294 100644
--- a/storageservicemanager/CMakeLists.txt
+++ b/storageservicemanager/CMakeLists.txt
@@ -33,6 +33,8 @@ target_link_libraries(storageservicemanager
pimcommon
kdepim
KF5::DBusAddons
+ KF5::XmlGui
+ KF5::Notifications
)
install(TARGETS storageservicemanager ${KDE_INSTALL_TARGETS_DEFAULT_ARGS})