summaryrefslogtreecommitdiffstats
path: root/kicker
diff options
context:
space:
mode:
authorSlávek Banko <slavek.banko@axis.cz>2014-02-04 02:46:39 +0100
committerSlávek Banko <slavek.banko@axis.cz>2014-02-04 02:46:39 +0100
commit1f3832a1368de214e95a38dd391367f8ae2456cb (patch)
treeac2c0e68c7a1393b124528054bd11df69e32381b /kicker
parent6275375b6aa17c6da78ab6486a8c930e9fd595f5 (diff)
downloadtdebase-1f3832a1368de214e95a38dd391367f8ae2456cb.tar.gz
tdebase-1f3832a1368de214e95a38dd391367f8ae2456cb.zip
Removed unnecessary dependency on dbus-tqt and dbus-1-tqt
Diffstat (limited to 'kicker')
-rw-r--r--kicker/kicker/ui/k_new_mnu.cpp4
-rw-r--r--kicker/kicker/ui/k_new_mnu.h4
-rw-r--r--kicker/taskmanager/CMakeLists.txt1
3 files changed, 4 insertions, 5 deletions
diff --git a/kicker/kicker/ui/k_new_mnu.cpp b/kicker/kicker/ui/k_new_mnu.cpp
index a083872fc..52b131781 100644
--- a/kicker/kicker/ui/k_new_mnu.cpp
+++ b/kicker/kicker/ui/k_new_mnu.cpp
@@ -104,15 +104,15 @@
#include "config.h"
+#ifdef COMPILE_HALBACKEND
#ifndef NO_QT3_DBUS_SUPPORT
/* We acknowledge the the dbus API is unstable */
#define DBUS_API_SUBJECT_TO_CHANGE
#include <dbus/connection.h>
#endif // NO_QT3_DBUS_SUPPORT
-#ifdef COMPILE_HALBACKEND
#include <hal/libhal.h>
-#endif
+#endif // COMPILE_HALBACKEND
#define WAIT_BEFORE_QUERYING 700
diff --git a/kicker/kicker/ui/k_new_mnu.h b/kicker/kicker/ui/k_new_mnu.h
index 7276e874a..49982d96f 100644
--- a/kicker/kicker/ui/k_new_mnu.h
+++ b/kicker/kicker/ui/k_new_mnu.h
@@ -45,15 +45,15 @@
#include <config.h>
+#ifdef COMPILE_HALBACKEND
#ifndef NO_QT3_DBUS_SUPPORT
/* We acknowledge the the dbus API is unstable */
#define DBUS_API_SUBJECT_TO_CHANGE
#include <dbus/connection.h>
#endif // NO_QT3_DBUS_SUPPORT
-#ifdef COMPILE_HALBACKEND
#include <hal/libhal.h>
-#endif
+#endif // COMPILE_HALBACKEND
class KickerClientMenu;
class KickoffTabBar;
diff --git a/kicker/taskmanager/CMakeLists.txt b/kicker/taskmanager/CMakeLists.txt
index 6e4a14f2c..852b6d52c 100644
--- a/kicker/taskmanager/CMakeLists.txt
+++ b/kicker/taskmanager/CMakeLists.txt
@@ -38,7 +38,6 @@ include_directories(
link_directories(
${TQT_LIBRARY_DIRS}
- ${DBUS_TQT_LIBRARY_DIRS}
)