diff -u'Nrpk~' kdenetwork-3.5.7~/kopete/protocols/groupwise/gwaccount.cpp kdenetwork-3.5.7/kopete/protocols/groupwise/gwaccount.cpp

--- kdenetwork-3.5.7~/kopete/protocols/groupwise/gwaccount.cpp	2007-05-14 11:40:07 +0400

+++ kdenetwork-3.5.7/kopete/protocols/groupwise/gwaccount.cpp	2007-05-24 15:01:59 +0400

@@ -43,7 +43,7 @@

 #include <kopeteview.h>

 #include "client.h"

-#include "qca.h"

+#include <qca.h>

 #include "gwcontact.h"

 #include "gwcontactlist.h"

 #include "gwprotocol.h"

diff -u'Nrpk~' kdenetwork-3.5.7~/kopete/protocols/groupwise/libgroupwise/Makefile.am kdenetwork-3.5.7/kopete/protocols/groupwise/libgroupwise/Makefile.am

--- kdenetwork-3.5.7~/kopete/protocols/groupwise/libgroupwise/Makefile.am	2006-10-01 21:26:41 +0400

+++ kdenetwork-3.5.7/kopete/protocols/groupwise/libgroupwise/Makefile.am	2007-05-24 15:01:59 +0400

@@ -26,7 +26,7 @@ libgroupwise_la_SOURCES = connector.cpp 

 							rtf.cc userdetailsmanager.cpp eventprotocol.cpp inputprotocolbase.cpp \

 				responseprotocol.cpp privacymanager.cpp gwglobal.cpp chatroommanager.cpp

 libgroupwise_la_LDFLAGS = -no-undefined $(all_libraries)

-libgroupwise_la_LIBADD = tasks/libgroupwise_tasks.la -lqt-mt qca/src/libqca.la 

+libgroupwise_la_LIBADD = tasks/libgroupwise_tasks.la -lqt-mt -lqca 

 tests_COMPILE_FIRST = libgroupwise.la libgwtest.la

@@ -36,5 +36,5 @@ libgwtest_la_SOURCES = coreprotocol.cpp 

 			stream.cpp tlshandler.cpp response.cpp connector.cpp securestream.cpp \

 			bytestream.cpp

 libgwtest_la_LDFLAGS = $(all_libraries) -no-undefined

-libgwtest_la_LIBADD = qca/src/libqca.la \

+libgwtest_la_LIBADD = -lqca \

 	$(top_builddir)/kopete/protocols/groupwise/libgroupwise/tasks/libgroupwise_tasks.la -lqt-mt

diff -u'Nrpk~' kdenetwork-3.5.7~/kopete/protocols/groupwise/libgroupwise/qcatlshandler.cpp kdenetwork-3.5.7/kopete/protocols/groupwise/libgroupwise/qcatlshandler.cpp

--- kdenetwork-3.5.7~/kopete/protocols/groupwise/libgroupwise/qcatlshandler.cpp	2005-09-10 12:20:20 +0400

+++ kdenetwork-3.5.7/kopete/protocols/groupwise/libgroupwise/qcatlshandler.cpp	2007-05-24 15:01:59 +0400

@@ -19,7 +19,7 @@

 #include <qtimer.h>

-#include "qca.h"

+#include <qca.h>

 #include "qcatlshandler.h"

diff -u'Nrpk~' kdenetwork-3.5.7~/kopete/protocols/jabber/jabberaccount.cpp kdenetwork-3.5.7/kopete/protocols/jabber/jabberaccount.cpp

--- kdenetwork-3.5.7~/kopete/protocols/jabber/jabberaccount.cpp	2006-10-01 21:26:47 +0400

+++ kdenetwork-3.5.7/kopete/protocols/jabber/jabberaccount.cpp	2007-05-24 15:01:59 +0400

@@ -25,7 +25,7 @@

 #include "filetransfer.h"

 #include "xmpp.h"

 #include "xmpp_tasks.h"

-#include "qca.h"

+#include <qca.h>

 #include "bsocket.h"

 #include "jabberaccount.h"

diff -u'Nrpk~' kdenetwork-3.5.7~/kopete/protocols/jabber/kioslave/Makefile.am kdenetwork-3.5.7/kopete/protocols/jabber/kioslave/Makefile.am

--- kdenetwork-3.5.7~/kopete/protocols/jabber/kioslave/Makefile.am	2005-09-10 12:20:22 +0400

+++ kdenetwork-3.5.7/kopete/protocols/jabber/kioslave/Makefile.am	2007-05-24 15:01:59 +0400

@@ -13,7 +13,7 @@ INCLUDES = \

 kde_module_LTLIBRARIES = kio_jabberdisco.la

 kio_jabberdisco_la_SOURCES = jabberdisco.cpp

-kio_jabberdisco_la_LIBADD = ../libjabberclient.la ../libiris/qca/src/libqca.la ../libiris/iris/include/libiris.la ../libiris/iris/xmpp-im/libiris_xmpp_im.la ../libiris/iris/xmpp-core/libiris_xmpp_core.la ../libiris/iris/jabber/libiris_jabber.la ../libiris/cutestuff/util/libcutestuff_util.la ../libiris/cutestuff/network/libcutestuff_network.la $(LIB_KIO)

+kio_jabberdisco_la_LIBADD = ../libjabberclient.la -lqca ../libiris/iris/include/libiris.la ../libiris/iris/xmpp-im/libiris_xmpp_im.la ../libiris/iris/xmpp-core/libiris_xmpp_core.la ../libiris/iris/jabber/libiris_jabber.la ../libiris/cutestuff/util/libcutestuff_util.la ../libiris/cutestuff/network/libcutestuff_network.la $(LIB_KIO)

 kio_jabberdisco_la_LDFLAGS = -no-undefined -module $(KDE_PLUGIN) $(all_libraries)

 noinst_HEADERS = jabberdisco.h

diff -u'Nrpk~' kdenetwork-3.5.7~/kopete/protocols/jabber/libiris/iris/xmpp-core/tlshandler.cpp kdenetwork-3.5.7/kopete/protocols/jabber/libiris/iris/xmpp-core/tlshandler.cpp

--- kdenetwork-3.5.7~/kopete/protocols/jabber/libiris/iris/xmpp-core/tlshandler.cpp	2005-09-10 12:20:21 +0400

+++ kdenetwork-3.5.7/kopete/protocols/jabber/libiris/iris/xmpp-core/tlshandler.cpp	2007-05-24 15:01:59 +0400

@@ -21,7 +21,7 @@

 #include"xmpp.h"

 #include<qtimer.h>

-#include"qca.h"

+#include<qca.h>

 using namespace XMPP;

diff -u'Nrpk~' kdenetwork-3.5.7~/kopete/protocols/jabber/Makefile.am kdenetwork-3.5.7/kopete/protocols/jabber/Makefile.am

--- kdenetwork-3.5.7~/kopete/protocols/jabber/Makefile.am	2006-10-01 21:26:47 +0400

+++ kdenetwork-3.5.7/kopete/protocols/jabber/Makefile.am	2007-05-24 15:01:59 +0400

@@ -51,7 +51,7 @@ kopete_jabber_la_LIBADD  = $(top_builddi

 	libiris/iris/jabber/libiris_jabber.la \

 	libiris/iris/xmpp-core/libiris_xmpp_core.la \

 	libiris/iris/xmpp-im/libiris_xmpp_im.la \

-	libiris/qca/src/libqca.la \

+	-lqca \

 	libiris/cutestuff/network/libcutestuff_network.la \

 	libiris/cutestuff/util/libcutestuff_util.la \

 	libjabberclient.la \

diff -u'Nrpk~' kdenetwork-3.5.7~/kopete/protocols/jabber/ui/jabberregisteraccount.cpp kdenetwork-3.5.7/kopete/protocols/jabber/ui/jabberregisteraccount.cpp

--- kdenetwork-3.5.7~/kopete/protocols/jabber/ui/jabberregisteraccount.cpp	2006-10-01 21:26:47 +0400

+++ kdenetwork-3.5.7/kopete/protocols/jabber/ui/jabberregisteraccount.cpp	2007-05-24 15:01:59 +0400

@@ -33,7 +33,7 @@

 #include <qtimer.h>

 #include <qregexp.h>

-#include "qca.h"

+#include <qca.h>

 #include "xmpp.h"

 #include "xmpp_tasks.h"