summaryrefslogtreecommitdiffstats
path: root/kopete/protocols/jabber/libiris/cutestuff
diff options
context:
space:
mode:
authorroman <[email protected]>2020-07-31 12:22:43 +0000
committerroman <[email protected]>2020-07-31 12:22:43 +0000
commit0cf6d999417faa59cba940897b0a62430f2cd685 (patch)
tree3f517b2901b006eab613d8e03323ca7c3d1ad3b6 /kopete/protocols/jabber/libiris/cutestuff
parentdfdf36e216921399afab86d0d683ef39b88adeab (diff)
parent767fedec73a3536a0d47ee497d6be0d2e4461108 (diff)
downloadtdenetwork-bug/3014/krfb.tar.gz
tdenetwork-bug/3014/krfb.zip
Merge branch 'master' into bug/3014/krfbbug/3014/krfb
Diffstat (limited to 'kopete/protocols/jabber/libiris/cutestuff')
-rw-r--r--kopete/protocols/jabber/libiris/cutestuff/network/CMakeLists.txt2
-rw-r--r--kopete/protocols/jabber/libiris/cutestuff/network/httppoll.cpp2
2 files changed, 2 insertions, 2 deletions
diff --git a/kopete/protocols/jabber/libiris/cutestuff/network/CMakeLists.txt b/kopete/protocols/jabber/libiris/cutestuff/network/CMakeLists.txt
index 151dd407..22e517fc 100644
--- a/kopete/protocols/jabber/libiris/cutestuff/network/CMakeLists.txt
+++ b/kopete/protocols/jabber/libiris/cutestuff/network/CMakeLists.txt
@@ -12,9 +12,9 @@
include_directories(
${CMAKE_CURRENT_BINARY_DIR}
${CMAKE_CURRENT_SOURCE_DIR}/../util
- ${CMAKE_CURRENT_SOURCE_DIR}/../../qca/src
${TDE_INCLUDE_DIR}
${TQT_INCLUDE_DIRS}
+ ${TQCA_INCLUDE_DIR}
)
diff --git a/kopete/protocols/jabber/libiris/cutestuff/network/httppoll.cpp b/kopete/protocols/jabber/libiris/cutestuff/network/httppoll.cpp
index 5e900119..ed211ac5 100644
--- a/kopete/protocols/jabber/libiris/cutestuff/network/httppoll.cpp
+++ b/kopete/protocols/jabber/libiris/cutestuff/network/httppoll.cpp
@@ -24,7 +24,7 @@
#include <tqurl.h>
#include <tqtimer.h>
#include <tqguardedptr.h>
-#include <qca.h>
+#include <tqca.h>
#include <stdlib.h>
#include "bsocket.h"
#include "base64.h"