diff --git a/CMakeLists.txt b/CMakeLists.txt index 9a7f0747..110130a1 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -223,7 +223,10 @@ macro_optional_add_subdirectory(kstyles) # imported from kde-runtime and other sub-projects macro_optional_add_subdirectory(kdesu) -macro_optional_add_subdirectory(phonon) +# XXX: katie and phonon do not play well yet +if (NOT KATIE_FOUND) + macro_optional_add_subdirectory(phonon) +endif() macro_optional_add_subdirectory(menu) macro_optional_add_subdirectory(kwalletd) macro_optional_add_subdirectory(kwalletmanager) diff --git a/knetattach/knetattach.cpp b/knetattach/knetattach.cpp index b3ecaa60..cd39dc68 100644 --- a/knetattach/knetattach.cpp +++ b/knetattach/knetattach.cpp @@ -21,6 +21,7 @@ #include "knetattach.h" #include +#include #include #include