diff options
Diffstat (limited to 'kicker')
| -rw-r--r-- | kicker/kicker/ui/k_new_mnu.cpp | 4 | ||||
| -rw-r--r-- | kicker/kicker/ui/k_new_mnu.h | 4 | ||||
| -rw-r--r-- | kicker/taskmanager/CMakeLists.txt | 1 |
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} ) |