From 5e580299e342bd77fc7479bbfd235f4446d7f05b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dan=20Vr=C3=A1til?= Date: Mon, 18 May 2015 15:20:35 +0200 Subject: KAsync has moved to it's own kasync.git repository --- common/CMakeLists.txt | 2 +- common/clientapi.h | 4 +++- common/facade.h | 3 ++- common/pipeline.cpp | 1 - common/pipeline.h | 3 ++- common/resource.h | 3 ++- common/resourceaccess.h | 3 ++- 7 files changed, 12 insertions(+), 7 deletions(-) (limited to 'common') diff --git a/common/CMakeLists.txt b/common/CMakeLists.txt index 4fb8a67..2ece210 100644 --- a/common/CMakeLists.txt +++ b/common/CMakeLists.txt @@ -50,5 +50,5 @@ generate_flatbuffers( generate_export_header(${PROJECT_NAME} BASE_NAME Akonadi2Common EXPORT_FILE_NAME akonadi2common_export.h) SET_TARGET_PROPERTIES(${PROJECT_NAME} PROPERTIES LINKER_LANGUAGE CXX) qt5_use_modules(${PROJECT_NAME} Network) -target_link_libraries(${PROJECT_NAME} ${storage_LIBS} KF5Async) +target_link_libraries(${PROJECT_NAME} ${storage_LIBS} KF5::Async) install(TARGETS ${PROJECT_NAME} ${KDE_INSTALL_TARGETS_DEFAULT_ARGS}) diff --git a/common/clientapi.h b/common/clientapi.h index 0ce1691..c098bb5 100644 --- a/common/clientapi.h +++ b/common/clientapi.h @@ -28,8 +28,10 @@ #include #include #include + +#include + #include "threadboundary.h" -#include "async/src/async.h" #include "resultprovider.h" namespace async { diff --git a/common/facade.h b/common/facade.h index dcb30b6..5743aa2 100644 --- a/common/facade.h +++ b/common/facade.h @@ -23,7 +23,8 @@ #include -#include "async/src/async.h" +#include + #include "resourceaccess.h" #include "commands.h" #include "createentity_generated.h" diff --git a/common/pipeline.cpp b/common/pipeline.cpp index ea82720..21cf1c5 100644 --- a/common/pipeline.cpp +++ b/common/pipeline.cpp @@ -29,7 +29,6 @@ #include "metadata_generated.h" #include "createentity_generated.h" #include "entitybuffer.h" -#include "async/src/async.h" #include "log.h" namespace Akonadi2 diff --git a/common/pipeline.h b/common/pipeline.h index d25fc56..b695bde 100644 --- a/common/pipeline.h +++ b/common/pipeline.h @@ -27,7 +27,8 @@ #include #include -#include "async/src/async.h" + +#include #include "entity_generated.h" diff --git a/common/resource.h b/common/resource.h index 170e080..ea1e9d8 100644 --- a/common/resource.h +++ b/common/resource.h @@ -21,7 +21,8 @@ #include #include #include -#include + +#include namespace Akonadi2 { diff --git a/common/resourceaccess.h b/common/resourceaccess.h index 648b12e..b779db9 100644 --- a/common/resourceaccess.h +++ b/common/resourceaccess.h @@ -24,8 +24,9 @@ #include #include +#include + #include -#include namespace Akonadi2 { -- cgit v1.2.3