From 0975d32db9d94661438956cc880448d2f4567b7a Mon Sep 17 00:00:00 2001
From: Aleix Pol <aleixpol@kde.org>
Date: Fri, 17 Apr 2015 18:02:14 +0200
Subject: [PATCH] Stop KDELibs4Support from being the all-mighty dependency

Now only Konsole application and some tests link against it
---
 src/Application.cpp          | 1 -
 src/CMakeLists.txt           | 2 +-
 src/MainWindow.cpp           | 1 -
 src/autotests/CMakeLists.txt | 4 ++--
 src/autotests/DBusTest.cpp   | 2 ++
 src/autotests/DBusTest.h     | 2 --
 6 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/src/Application.cpp b/src/Application.cpp
index 3ccba815..0857eaf2 100644
--- a/src/Application.cpp
+++ b/src/Application.cpp
@@ -26,7 +26,6 @@
 #include <QtCore/QDir>
 
 // KDE
-#include <KAction>
 #include <KActionCollection>
 #include <KCmdLineArgs>
 #include <QDebug>
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 43a99661..2ff6f375 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -131,7 +131,6 @@ set(konsole_LIBS
                  KF5::Bookmarks
                  KF5::I18n
                  KF5::Pty
-                 KF5::KDELibs4Support
                  KF5::KIOWidgets
 )
 
@@ -182,6 +181,7 @@ target_link_libraries(kdeinit_konsole konsoleprivate KF5::XmlGui KF5::WindowSyst
   KF5::I18n
   KF5::KIOWidgets
   KF5::NotifyConfig
+  KF5::KDELibs4Support
 )
 
 install(TARGETS kdeinit_konsole konsole
diff --git a/src/MainWindow.cpp b/src/MainWindow.cpp
index 7c4f43a8..f3a720e1 100644
--- a/src/MainWindow.cpp
+++ b/src/MainWindow.cpp
@@ -25,7 +25,6 @@
 
 // KDE
 #include <KAcceleratorManager>
-#include <KAction>
 #include <KActionCollection>
 #include <KActionMenu>
 #include <KCmdLineArgs>
diff --git a/src/autotests/CMakeLists.txt b/src/autotests/CMakeLists.txt
index 70fe919c..c4897dac 100644
--- a/src/autotests/CMakeLists.txt
+++ b/src/autotests/CMakeLists.txt
@@ -19,7 +19,7 @@ if (NOT ${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
     add_executable(DBusTest DBusTest.cpp)
     ecm_mark_as_test(DBusTest)
     add_test(DBusTest DBusTest)
-    target_link_libraries(DBusTest ${KONSOLE_TEST_LIBS} Qt5::DBus)
+    target_link_libraries(DBusTest ${KONSOLE_TEST_LIBS} Qt5::DBus KF5::KDELibs4Support)
 endif()
 
 add_executable(HistoryTest HistoryTest.cpp)
@@ -37,7 +37,7 @@ if (NOT ${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
     add_executable(PartTest PartTest.cpp)
     ecm_mark_as_test(PartTest)
     add_test(PartTest PartTest)
-    target_link_libraries(PartTest KF5::XmlGui KF5::Parts KF5::Pty
+    target_link_libraries(PartTest KF5::XmlGui KF5::Parts KF5::Pty KF5::KDELibs4Support
                                ${KONSOLE_TEST_LIBS})
 endif()
 
diff --git a/src/autotests/DBusTest.cpp b/src/autotests/DBusTest.cpp
index 998329dd..ac7b257c 100644
--- a/src/autotests/DBusTest.cpp
+++ b/src/autotests/DBusTest.cpp
@@ -20,6 +20,8 @@
 // Own
 #include "DBusTest.h"
 #include "../Session.h"
+#include <KDebug>
+#include <KProcess>
 
 using namespace Konsole;
 
diff --git a/src/autotests/DBusTest.h b/src/autotests/DBusTest.h
index 2ea1700d..2112f132 100644
--- a/src/autotests/DBusTest.h
+++ b/src/autotests/DBusTest.h
@@ -25,8 +25,6 @@
 #include <QtDBus/QDBusInterface>
 #include <QtDBus/QDBusReply>
 #include <QtCore/QTextCodec>
-#include <KDebug>
-#include <KProcess>
 
 #include <unistd.h>