diff options
| author | roman <roman@oscada.org> | 2020-07-31 12:22:43 +0000 |
|---|---|---|
| committer | roman <roman@oscada.org> | 2020-07-31 12:22:43 +0000 |
| commit | 0cf6d999417faa59cba940897b0a62430f2cd685 (patch) | |
| tree | 3f517b2901b006eab613d8e03323ca7c3d1ad3b6 /kopete/protocols/jabber/ui | |
| parent | dfdf36e216921399afab86d0d683ef39b88adeab (diff) | |
| parent | 767fedec73a3536a0d47ee497d6be0d2e4461108 (diff) | |
| download | tdenetwork-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/ui')
| -rw-r--r-- | kopete/protocols/jabber/ui/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | kopete/protocols/jabber/ui/jabberregisteraccount.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/kopete/protocols/jabber/ui/CMakeLists.txt b/kopete/protocols/jabber/ui/CMakeLists.txt index a4488d62..0493c9ee 100644 --- a/kopete/protocols/jabber/ui/CMakeLists.txt +++ b/kopete/protocols/jabber/ui/CMakeLists.txt @@ -16,13 +16,13 @@ include_directories( ${CMAKE_CURRENT_SOURCE_DIR}/../libiris/iris/include ${CMAKE_CURRENT_SOURCE_DIR}/../libiris/iris/jabber ${CMAKE_CURRENT_SOURCE_DIR}/../libiris/iris/xmpp-im - ${CMAKE_CURRENT_SOURCE_DIR}/../libiris/qca/src ${CMAKE_CURRENT_SOURCE_DIR}/../libiris/cutestuff/util ${CMAKE_CURRENT_SOURCE_DIR}/../../../libkopete ${CMAKE_CURRENT_SOURCE_DIR}/../../../libkopete/ui ${CMAKE_BINARY_DIR} ${TDE_INCLUDE_DIR} ${TQT_INCLUDE_DIRS} + ${TQCA_INCLUDE_DIR} ) diff --git a/kopete/protocols/jabber/ui/jabberregisteraccount.cpp b/kopete/protocols/jabber/ui/jabberregisteraccount.cpp index 753636e0..a75e206e 100644 --- a/kopete/protocols/jabber/ui/jabberregisteraccount.cpp +++ b/kopete/protocols/jabber/ui/jabberregisteraccount.cpp @@ -33,7 +33,7 @@ #include <tqtimer.h> #include <tqregexp.h> -#include <qca.h> +#include <tqca.h> #include "xmpp.h" #include "xmpp_tasks.h" |