From aac583ddd220ca4b2c0ce9c3eda7bfa96b135180 Mon Sep 17 00:00:00 2001
From: Ivailo Monev <xakepa10@gmail.com>
Date: Wed, 12 Aug 2015 21:07:13 +0300
Subject: [PATCH] generic: minor fixes for build against katie

---
 CMakeLists.txt            | 5 ++++-
 knetattach/knetattach.cpp | 1 +
 2 files changed, 5 insertions(+), 1 deletion(-)

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 <QtCore/QVariant>
+#include <QtCore/qtextcodec.h>
 
 #include <KIO/NetAccess>
 #include <KMessageBox>