From b176a7c0279670a859c85c88d75ac150e0dfae2f Mon Sep 17 00:00:00 2001 From: Christian Mollekopf Date: Wed, 1 Mar 2017 22:26:52 +0100 Subject: Adapted to KAsync changes --- accounts/gmail/CMakeLists.txt | 1 - accounts/imap/CMakeLists.txt | 1 - accounts/kolabnow/CMakeLists.txt | 1 - accounts/maildir/CMakeLists.txt | 1 - framework/CMakeLists.txt | 2 +- framework/actions/CMakeLists.txt | 2 +- framework/actions/actionhandler.h | 2 +- framework/domain/CMakeLists.txt | 2 +- framework/domain/controller.h | 2 +- 9 files changed, 5 insertions(+), 9 deletions(-) diff --git a/accounts/gmail/CMakeLists.txt b/accounts/gmail/CMakeLists.txt index 9eea5702..e99f51ba 100644 --- a/accounts/gmail/CMakeLists.txt +++ b/accounts/gmail/CMakeLists.txt @@ -23,7 +23,6 @@ find_package(Qt5 REQUIRED NO_MODULE COMPONENTS Core Quick Test Gui) set (QT_MIN_VERSION "5.4.0") find_package(Sink CONFIG REQUIRED) -find_package(KF5Async CONFIG REQUIRED) find_package(KF5 REQUIRED COMPONENTS Package Mime) include_directories(SYSTEM ${KDE_INSTALL_FULL_INCLUDEDIR}/KF5/) diff --git a/accounts/imap/CMakeLists.txt b/accounts/imap/CMakeLists.txt index a6fb6b10..27f08b79 100644 --- a/accounts/imap/CMakeLists.txt +++ b/accounts/imap/CMakeLists.txt @@ -23,7 +23,6 @@ find_package(Qt5 REQUIRED NO_MODULE COMPONENTS Core Quick Test Gui) set (QT_MIN_VERSION "5.4.0") find_package(Sink CONFIG REQUIRED) -find_package(KF5Async CONFIG REQUIRED) find_package(KF5 REQUIRED COMPONENTS Package Mime) include_directories(SYSTEM ${KDE_INSTALL_FULL_INCLUDEDIR}/KF5/) diff --git a/accounts/kolabnow/CMakeLists.txt b/accounts/kolabnow/CMakeLists.txt index e2d6f3db..48b28eea 100644 --- a/accounts/kolabnow/CMakeLists.txt +++ b/accounts/kolabnow/CMakeLists.txt @@ -23,7 +23,6 @@ find_package(Qt5 REQUIRED NO_MODULE COMPONENTS Core Quick Test Gui) set (QT_MIN_VERSION "5.4.0") find_package(Sink CONFIG REQUIRED) -find_package(KF5Async CONFIG REQUIRED) find_package(KF5 REQUIRED COMPONENTS Package Mime) include_directories(SYSTEM ${KDE_INSTALL_FULL_INCLUDEDIR}/KF5/) diff --git a/accounts/maildir/CMakeLists.txt b/accounts/maildir/CMakeLists.txt index 8791e37e..0b6a668f 100644 --- a/accounts/maildir/CMakeLists.txt +++ b/accounts/maildir/CMakeLists.txt @@ -23,7 +23,6 @@ find_package(Qt5 REQUIRED NO_MODULE COMPONENTS Core Quick Test Gui) set (QT_MIN_VERSION "5.4.0") find_package(Sink CONFIG REQUIRED) -find_package(KF5Async CONFIG REQUIRED) find_package(KF5 REQUIRED COMPONENTS Package Mime) include_directories(SYSTEM ${KDE_INSTALL_FULL_INCLUDEDIR}/KF5/) diff --git a/framework/CMakeLists.txt b/framework/CMakeLists.txt index 86a61bcf..aa2362f1 100644 --- a/framework/CMakeLists.txt +++ b/framework/CMakeLists.txt @@ -19,7 +19,7 @@ find_package(Qt5 COMPONENTS REQUIRED Core Qml) find_package(KF5MimeTreeParser "5.1.46" CONFIG REQUIRED) find_package(KF5Mime "4.87.0" CONFIG REQUIRED) find_package(Sink CONFIG REQUIRED) -find_package(KF5Async CONFIG REQUIRED) +find_package(KAsync CONFIG REQUIRED) find_package(QGpgme CONFIG REQUIRED) find_package(KF5Codecs CONFIG REQUIRED) diff --git a/framework/actions/CMakeLists.txt b/framework/actions/CMakeLists.txt index 9fc43b9b..2b1bb230 100644 --- a/framework/actions/CMakeLists.txt +++ b/framework/actions/CMakeLists.txt @@ -9,7 +9,7 @@ set(SRCS add_library(actionplugin SHARED ${SRCS}) -target_link_libraries(actionplugin KF5::Async sink) +target_link_libraries(actionplugin KAsync sink) qt5_use_modules(actionplugin Core Quick Qml) install(TARGETS actionplugin DESTINATION ${QML_INSTALL_DIR}/org/kube/framework/actions) diff --git a/framework/actions/actionhandler.h b/framework/actions/actionhandler.h index c0e1b318..fbaedad1 100644 --- a/framework/actions/actionhandler.h +++ b/framework/actions/actionhandler.h @@ -21,7 +21,7 @@ #include #include #include -#include +#include #include "actionresult.h" #include "context.h" diff --git a/framework/domain/CMakeLists.txt b/framework/domain/CMakeLists.txt index 31ca5df9..9abc54b0 100644 --- a/framework/domain/CMakeLists.txt +++ b/framework/domain/CMakeLists.txt @@ -31,7 +31,7 @@ find_package(KF5 REQUIRED COMPONENTS Package) add_library(mailplugin SHARED ${mailplugin_SRCS}) qt5_use_modules(mailplugin Core Quick Qml WebKitWidgets Test) -target_link_libraries(mailplugin actionplugin settingsplugin sink mimetreeparser KF5::MimeTreeParser KF5::Codecs KF5::Package KF5::Async) +target_link_libraries(mailplugin actionplugin settingsplugin sink mimetreeparser KF5::MimeTreeParser KF5::Codecs KF5::Package KAsync) add_subdirectory(actions/tests) diff --git a/framework/domain/controller.h b/framework/domain/controller.h index 8e6d7155..bf2a7ace 100644 --- a/framework/domain/controller.h +++ b/framework/domain/controller.h @@ -20,7 +20,7 @@ #include #include -#include +#include #define KUBE_CONTROLLER_PROPERTY(TYPE, NAME, LOWERCASENAME) \ public: Q_PROPERTY(TYPE LOWERCASENAME MEMBER m##NAME NOTIFY LOWERCASENAME##Changed) \ -- cgit v1.2.3