Remove the use of kwindowsystem, wasn't needed

spersson · May 14, 2015 · 1084cb9 · 1084cb9
1 parent e3c4c13
commit 1084cb9
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 5 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -24,7 +24,19 @@ include(FeatureSummary)
 include(ECMInstallIcons)
 
 find_package(Qt5 REQUIRED COMPONENTS Widgets)
-find_package(KF5 REQUIRED COMPONENTS Solid KIO IdleTime Init I18n WindowSystem Notifications CoreAddons IconThemes DBusAddons)
+find_package(KF5 REQUIRED COMPONENTS
+Solid
+KIO
+IdleTime
+I18n
+Notifications
+CoreAddons
+IconThemes
+DBusAddons
+Config
+Init # needed for the kdeinit cmake macro
+)
+
 add_subdirectory(daemon)
 add_subdirectory(icons)
 add_subdirectory(filedigger)

diff --git a/daemon/CMakeLists.txt b/daemon/CMakeLists.txt
@@ -21,12 +21,12 @@ target_link_libraries(kdeinit_kup-daemon
 Qt5::Core
 Qt5::DBus
 Qt5::Gui
+KF5::ConfigCore
 KF5::KIOCore
 KF5::KIOFileWidgets
 KF5::IdleTime
 KF5::I18n
 KF5::Solid
-KF5::WindowSystem
 KF5::Notifications
 KF5::CoreAddons
 KF5::DBusAddons

diff --git a/daemon/main.cpp b/daemon/main.cpp
@@ -23,7 +23,6 @@
 #include <KAboutData>
 #include <KDBusService>
 #include <KLocalizedString>
-#include <KStartupInfo>
 
 #include <QApplication>
 #include <QDebug>
@@ -65,8 +64,6 @@ extern "C" int Q_DECL_EXPORT kdemain(int argc, char *argv[]) {
 	// This call will exit() if an instance is already running
 	KDBusService lService(KDBusService::Unique);
 
-	KStartupInfo::appStarted(); //make startup notification go away.
-
 	lDaemon->setupGuiStuff();
 
 	// these calls will make session management not try (and fail because of KDBusService) to start

diff --git a/kcm/CMakeLists.txt b/kcm/CMakeLists.txt
@@ -25,6 +25,7 @@ Qt5::Core
 Qt5::DBus
 Qt5::Gui
 KF5::CoreAddons
+KF5::ConfigCore
 KF5::KIOCore
 KF5::KIOFileWidgets
 KF5::Solid