summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristian Mollekopf <chrigi_1@fastmail.fm>2017-03-01 22:26:52 +0100
committerChristian Mollekopf <chrigi_1@fastmail.fm>2017-03-01 22:26:52 +0100
commitb176a7c0279670a859c85c88d75ac150e0dfae2f (patch)
tree988c499ae487f89ce2837bbd570ed3f1bc2be826
parent0a8f96bceb3a6ef9d7555e849668916e2b53b4b0 (diff)
downloadkube-b176a7c0279670a859c85c88d75ac150e0dfae2f.tar.gz
kube-b176a7c0279670a859c85c88d75ac150e0dfae2f.zip
Adapted to KAsync changes
-rw-r--r--accounts/gmail/CMakeLists.txt1
-rw-r--r--accounts/imap/CMakeLists.txt1
-rw-r--r--accounts/kolabnow/CMakeLists.txt1
-rw-r--r--accounts/maildir/CMakeLists.txt1
-rw-r--r--framework/CMakeLists.txt2
-rw-r--r--framework/actions/CMakeLists.txt2
-rw-r--r--framework/actions/actionhandler.h2
-rw-r--r--framework/domain/CMakeLists.txt2
-rw-r--r--framework/domain/controller.h2
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)
23 23
24set (QT_MIN_VERSION "5.4.0") 24set (QT_MIN_VERSION "5.4.0")
25find_package(Sink CONFIG REQUIRED) 25find_package(Sink CONFIG REQUIRED)
26find_package(KF5Async CONFIG REQUIRED)
27find_package(KF5 REQUIRED COMPONENTS Package Mime) 26find_package(KF5 REQUIRED COMPONENTS Package Mime)
28 27
29include_directories(SYSTEM ${KDE_INSTALL_FULL_INCLUDEDIR}/KF5/) 28include_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)
23 23
24set (QT_MIN_VERSION "5.4.0") 24set (QT_MIN_VERSION "5.4.0")
25find_package(Sink CONFIG REQUIRED) 25find_package(Sink CONFIG REQUIRED)
26find_package(KF5Async CONFIG REQUIRED)
27find_package(KF5 REQUIRED COMPONENTS Package Mime) 26find_package(KF5 REQUIRED COMPONENTS Package Mime)
28 27
29include_directories(SYSTEM ${KDE_INSTALL_FULL_INCLUDEDIR}/KF5/) 28include_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)
23 23
24set (QT_MIN_VERSION "5.4.0") 24set (QT_MIN_VERSION "5.4.0")
25find_package(Sink CONFIG REQUIRED) 25find_package(Sink CONFIG REQUIRED)
26find_package(KF5Async CONFIG REQUIRED)
27find_package(KF5 REQUIRED COMPONENTS Package Mime) 26find_package(KF5 REQUIRED COMPONENTS Package Mime)
28 27
29include_directories(SYSTEM ${KDE_INSTALL_FULL_INCLUDEDIR}/KF5/) 28include_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)
23 23
24set (QT_MIN_VERSION "5.4.0") 24set (QT_MIN_VERSION "5.4.0")
25find_package(Sink CONFIG REQUIRED) 25find_package(Sink CONFIG REQUIRED)
26find_package(KF5Async CONFIG REQUIRED)
27find_package(KF5 REQUIRED COMPONENTS Package Mime) 26find_package(KF5 REQUIRED COMPONENTS Package Mime)
28 27
29include_directories(SYSTEM ${KDE_INSTALL_FULL_INCLUDEDIR}/KF5/) 28include_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)
19find_package(KF5MimeTreeParser "5.1.46" CONFIG REQUIRED) 19find_package(KF5MimeTreeParser "5.1.46" CONFIG REQUIRED)
20find_package(KF5Mime "4.87.0" CONFIG REQUIRED) 20find_package(KF5Mime "4.87.0" CONFIG REQUIRED)
21find_package(Sink CONFIG REQUIRED) 21find_package(Sink CONFIG REQUIRED)
22find_package(KF5Async CONFIG REQUIRED) 22find_package(KAsync CONFIG REQUIRED)
23find_package(QGpgme CONFIG REQUIRED) 23find_package(QGpgme CONFIG REQUIRED)
24find_package(KF5Codecs CONFIG REQUIRED) 24find_package(KF5Codecs CONFIG REQUIRED)
25 25
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
9 9
10add_library(actionplugin SHARED ${SRCS}) 10add_library(actionplugin SHARED ${SRCS})
11 11
12target_link_libraries(actionplugin KF5::Async sink) 12target_link_libraries(actionplugin KAsync sink)
13qt5_use_modules(actionplugin Core Quick Qml) 13qt5_use_modules(actionplugin Core Quick Qml)
14 14
15install(TARGETS actionplugin DESTINATION ${QML_INSTALL_DIR}/org/kube/framework/actions) 15install(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 @@
21#include <QObject> 21#include <QObject>
22#include <QMultiMap> 22#include <QMultiMap>
23#include <functional> 23#include <functional>
24#include <Async/Async> 24#include <KAsync/Async>
25 25
26#include "actionresult.h" 26#include "actionresult.h"
27#include "context.h" 27#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)
31add_library(mailplugin SHARED ${mailplugin_SRCS}) 31add_library(mailplugin SHARED ${mailplugin_SRCS})
32 32
33qt5_use_modules(mailplugin Core Quick Qml WebKitWidgets Test) 33qt5_use_modules(mailplugin Core Quick Qml WebKitWidgets Test)
34target_link_libraries(mailplugin actionplugin settingsplugin sink mimetreeparser KF5::MimeTreeParser KF5::Codecs KF5::Package KF5::Async) 34target_link_libraries(mailplugin actionplugin settingsplugin sink mimetreeparser KF5::MimeTreeParser KF5::Codecs KF5::Package KAsync)
35 35
36add_subdirectory(actions/tests) 36add_subdirectory(actions/tests)
37 37
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 @@
20 20
21#include <QObject> 21#include <QObject>
22#include <QVariant> 22#include <QVariant>
23#include <Async/Async> 23#include <KAsync/Async>
24 24
25#define KUBE_CONTROLLER_PROPERTY(TYPE, NAME, LOWERCASENAME) \ 25#define KUBE_CONTROLLER_PROPERTY(TYPE, NAME, LOWERCASENAME) \
26 public: Q_PROPERTY(TYPE LOWERCASENAME MEMBER m##NAME NOTIFY LOWERCASENAME##Changed) \ 26 public: Q_PROPERTY(TYPE LOWERCASENAME MEMBER m##NAME NOTIFY LOWERCASENAME##Changed) \