summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVolker Krause <[email protected]>2015-08-16 13:40:27 +0200
committerVolker Krause <[email protected]>2015-08-16 13:40:27 +0200
commit78643ee9e2d74da443faa0eb8a0158bfdd21a73a (patch)
treea8563ac6e7472241b01edb081bb1a7514dc00984
parent7351189e8a0942977d875e35d7d37e11592b86c6 (diff)
Remove KDELibs4Support from the public link interface of messageviewer.
-rw-r--r--examples/mailreader/CMakeLists.txt1
-rw-r--r--examples/mailreader/mailreaderview.cpp8
-rw-r--r--examples/mailreader/mailreaderview.h2
-rw-r--r--grantleeeditor/headerthemeeditor/themeeditormainwindow.cpp2
-rw-r--r--messageviewer/CMakeLists.txt2
-rw-r--r--messageviewer/autotests/CMakeLists.txt2
-rw-r--r--plugins/messageviewer/bodypartformatter/vcard/CMakeLists.txt2
-rw-r--r--templateparser/CMakeLists.txt1
-rw-r--r--templateparser/autotests/CMakeLists.txt2
9 files changed, 13 insertions, 9 deletions
diff --git a/examples/mailreader/CMakeLists.txt b/examples/mailreader/CMakeLists.txt
index 7b27fd2..46b479b 100644
--- a/examples/mailreader/CMakeLists.txt
+++ b/examples/mailreader/CMakeLists.txt
@@ -21,6 +21,7 @@ add_executable(akonadimailreader ${mailreader_SRCS})
target_link_libraries(akonadimailreader
KF5::AkonadiMime
KF5::AkonadiCore
+ KF5::XmlGui
kdepim
kleo
diff --git a/examples/mailreader/mailreaderview.cpp b/examples/mailreader/mailreaderview.cpp
index 71ff439..46fec91 100644
--- a/examples/mailreader/mailreaderview.cpp
+++ b/examples/mailreader/mailreaderview.cpp
@@ -15,7 +15,7 @@
#include <QLabel>
#include <QHBoxLayout>
#include <QDebug>
-#include <KUrl>
+#include <QUrl>
#include <AkonadiCore/item.h>
#include "messagelist/core/settings.h"
@@ -31,8 +31,8 @@ mailreaderView::mailreaderView(QWidget *parent)
setLayout(layout);
setAutoFillBackground(true);
displayAboutPage();
- connect(m_readerWin, SIGNAL(urlClicked(Akonadi::Item,KUrl)), this,
- SLOT(urlClicked(Akonadi::Item,KUrl)));
+ connect(m_readerWin, SIGNAL(urlClicked(Akonadi::Item,QUrl)), this,
+ SLOT(urlClicked(Akonadi::Item,QUrl)));
}
mailreaderView::~mailreaderView()
@@ -80,7 +80,7 @@ void mailreaderView::displayAboutPage()
m_readerWin->displaySplashPage(info.toString());
}
-void mailreaderView::urlClicked(const Akonadi::Item &item , const KUrl &url)
+void mailreaderView::urlClicked(const Akonadi::Item &item , const QUrl &url)
{
Q_UNUSED(item);
//TODO "Handle click"
diff --git a/examples/mailreader/mailreaderview.h b/examples/mailreader/mailreaderview.h
index 1667a2d..f950399 100644
--- a/examples/mailreader/mailreaderview.h
+++ b/examples/mailreader/mailreaderview.h
@@ -73,7 +73,7 @@ Q_SIGNALS:
private Q_SLOTS:
void switchColors();
void settingsChanged();
- void urlClicked(const Akonadi::Item &, const KUrl &);
+ void urlClicked(const Akonadi::Item &, const QUrl &);
};
#endif // mailreaderVIEW_H
diff --git a/grantleeeditor/headerthemeeditor/themeeditormainwindow.cpp b/grantleeeditor/headerthemeeditor/themeeditormainwindow.cpp
index 71ee27c..1e91243 100644
--- a/grantleeeditor/headerthemeeditor/themeeditormainwindow.cpp
+++ b/grantleeeditor/headerthemeeditor/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/messageviewer/CMakeLists.txt b/messageviewer/CMakeLists.txt
index 1b17b28..e483363 100644
--- a/messageviewer/CMakeLists.txt
+++ b/messageviewer/CMakeLists.txt
@@ -228,7 +228,6 @@ PUBLIC
KF5::AkonadiMime
KF5::AkonadiNotes
KF5::Contacts
- KF5::KDELibs4Support
${_mailwebview_lib}
PRIVATE
grantleetheme
@@ -241,6 +240,7 @@ PRIVATE
KF5::Mime
KF5::Mbox
KF5::Gpgmepp
+ KF5::KDELibs4Support
)
target_include_directories(messageviewer PUBLIC "$<BUILD_INTERFACE:${messageviewer_SOURCE_DIR};${messageviewer_BINARY_DIR}>")
diff --git a/messageviewer/autotests/CMakeLists.txt b/messageviewer/autotests/CMakeLists.txt
index 5b60a89..2497ef8 100644
--- a/messageviewer/autotests/CMakeLists.txt
+++ b/messageviewer/autotests/CMakeLists.txt
@@ -69,5 +69,5 @@ ecm_add_test(converthtmltoplaintexttest.cpp ../viewer/converthtmltoplaintext.cpp
set(KDEPIMLIBS_RUN_ISOLATED_TESTS TRUE)
set(KDEPIMLIBS_RUN_SQLITE_ISOLATED_TESTS TRUE)
-add_akonadi_isolated_test_advanced( viewertest.cpp "" "messageviewer")
+add_akonadi_isolated_test_advanced( viewertest.cpp "" "messageviewer;KF5::XmlGui")
diff --git a/plugins/messageviewer/bodypartformatter/vcard/CMakeLists.txt b/plugins/messageviewer/bodypartformatter/vcard/CMakeLists.txt
index 98424dd..61154c7 100644
--- a/plugins/messageviewer/bodypartformatter/vcard/CMakeLists.txt
+++ b/plugins/messageviewer/bodypartformatter/vcard/CMakeLists.txt
@@ -3,7 +3,7 @@ add_definitions(-DTRANSLATION_DOMAIN=\"messageviewer_text_vcard_plugin\")
set(messageviewer_bodypartformatter_text_vcard_PART_SRCS text_vcard.cpp vcardmemento.cpp updatecontactjob.cpp vcard_debug.cpp)
add_library(messageviewer_bodypartformatter_text_vcard MODULE ${messageviewer_bodypartformatter_text_vcard_PART_SRCS})
-target_link_libraries(messageviewer_bodypartformatter_text_vcard KF5::Mime KF5::Contacts kdepim messageviewer)
+target_link_libraries(messageviewer_bodypartformatter_text_vcard KF5::Mime KF5::Contacts kdepim messageviewer KF5::KDELibs4Support)
install(TARGETS messageviewer_bodypartformatter_text_vcard DESTINATION ${KDE_INSTALL_PLUGINDIR})
install(FILES text_vcard.desktop DESTINATION ${KDE_INSTALL_DATADIR}/messageviewer/plugins/bodypartformatter)
diff --git a/templateparser/CMakeLists.txt b/templateparser/CMakeLists.txt
index 9bf8490..a5ad9d0 100644
--- a/templateparser/CMakeLists.txt
+++ b/templateparser/CMakeLists.txt
@@ -50,6 +50,7 @@ PRIVATE
KF5::IdentityManagement
messagecore
Qt5::WebKitWidgets
+ KF5::KDELibs4Support
)
set_target_properties(templateparser PROPERTIES
VERSION ${KDEPIM_LIB_VERSION}
diff --git a/templateparser/autotests/CMakeLists.txt b/templateparser/autotests/CMakeLists.txt
index 4d51299..076b354 100644
--- a/templateparser/autotests/CMakeLists.txt
+++ b/templateparser/autotests/CMakeLists.txt
@@ -22,6 +22,8 @@ macro(add_templateparser_unittest _source)
KF5::Mime
KF5::AkonadiCore
KF5::IdentityManagement
+ KF5::XmlGui
+ KF5::KDELibs4Support
)
add_gpg_crypto_test(${_name} templateparser-${_name})
endmacro()