Commit d487300d authored by Laurent Montel's avatar Laurent Montel 😁

Start ot make kolab compile

parent 070092c7
......@@ -48,6 +48,8 @@ find_package(KF5Mbox ${KDEPIMLIBS_LIB_VERSION} CONFIG REQUIRED)
# Extra package
find_package(KF5GAPI "4.70.0" CONFIG)
# Xsltproc
find_package(Xsltproc)
set_package_properties(Xsltproc PROPERTIES DESCRIPTION "XSLT processor from libxslt" TYPE REQUIRED PURPOSE "Required to generate D-Bus interfaces for all Akonadi resources.")
......@@ -59,7 +61,7 @@ find_package(SignOnQt 8.56 QUIET CONFIG)
set_package_properties(SignOnQt PROPERTIES DESCRIPTION "SignOn Qt bindings for accounts-sso" URL "https://code.google.com/p/accounts-sso/" TYPE OPTIONAL PURPOSE "Required to support SignOn in different resources")
# Libkolab
find_package(Libkolab 0.5 QUIET CONFIG)
find_package(KF5Kolab "1.0.0" QUIET CONFIG)
set_package_properties(Libkolab PROPERTIES DESCRIPTION "libkolab" URL "http://mirror.kolabsys.com/pub/releases" TYPE OPTIONAL PURPOSE "The Kolab Format libraries are required to build the Kolab Groupware Resource")
# Libkolabxml
......@@ -110,10 +112,10 @@ add_subdirectory( dav )
add_subdirectory( ical )
add_subdirectory( imap )
add_subdirectory( kdeaccounts )
#if (Libkolab_FOUND AND Libkolabxml_FOUND)
# add_subdirectory( kolabproxy )
# add_subdirectory( kolab )
#endif()
if (KF5Kolab_FOUND AND Libkolabxml_FOUND)
add_subdirectory( kolabproxy )
add_subdirectory( kolab )
endif()
add_subdirectory( localbookmarks )
......
......@@ -10,7 +10,6 @@ add_definitions( -DQT_NO_CAST_TO_ASCII )
add_definitions(-DTRANSLATION_DOMAIN=\"akonadi_imap_resource\")
find_package(KF5Imap ${KF5_VERSION} CONFIG REQUIRED)
########### next target ###############
......@@ -46,7 +45,7 @@ target_link_libraries(akonadi_kolab_resource
KF5::IdentityManagement
imapresource
folderarchivesettings
${Libkolab_LIBRARIES}
KF5::Kolab
${Libkolabxml_LIBRARIES}
KF5::Abc
KF5::CalendarCore
......
......@@ -23,7 +23,7 @@
#include <AkonadiCore/Collection>
#include <AkonadiCore/ItemFetchJob>
#include <AkonadiCore/ItemFetchScope>
#include <Akonadi/notes/noteutils.h>
#include <akonadi/notes/noteutils.h>
#include <kolabobject.h>
#include <errorhandler.h>
......
......@@ -77,7 +77,7 @@ void KolabResource::retrieveItems(const Akonadi::Collection &col)
void KolabResource::onItemRetrievalCollectionFetchDone(KJob *job)
{
if (job->error()) {
kWarning() << "Failed to retrieve collection before RetrieveItemsTask: " << job->errorString();
qWarning() << "Failed to retrieve collection before RetrieveItemsTask: " << job->errorString();
cancelTask(i18n("Failed to retrieve items."));
return;
}
......@@ -112,7 +112,7 @@ void KolabResource::itemAdded(const Akonadi::Item& item, const Akonadi::Collecti
bool ok = true;
const Akonadi::Item imapItem = KolabHelpers::translateToImap(item, ok);
if (!ok) {
kWarning() << "Failed to convert item";
qWarning() << "Failed to convert item";
cancelTask();
return;
}
......@@ -124,7 +124,7 @@ void KolabResource::itemChanged(const Akonadi::Item& item, const QSet< QByteArra
bool ok = true;
const Akonadi::Item imapItem = KolabHelpers::translateToImap(item, ok);
if (!ok) {
kWarning() << "Failed to convert item";
qWarning() << "Failed to convert item";
cancelTask();
return;
}
......@@ -136,7 +136,7 @@ void KolabResource::itemsMoved(const Akonadi::Item::List& items, const Akonadi::
bool ok = true;
const Akonadi::Item::List imapItems = KolabHelpers::translateToImap(items, ok);
if (!ok) {
kWarning() << "Failed to convert item";
qWarning() << "Failed to convert item";
cancelTask();
return;
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment