From 5755ad47145d2985ba74354961b4127d82c516f6 Mon Sep 17 00:00:00 2001 From: Christian Mollekopf Date: Wed, 5 Apr 2017 13:00:21 +0200 Subject: A single framework plugin --- framework/domain/CMakeLists.txt | 2 +- framework/domain/actions/tests/CMakeLists.txt | 2 +- framework/domain/mailplugin.cpp | 2 -- 3 files changed, 2 insertions(+), 4 deletions(-) (limited to 'framework/domain') diff --git a/framework/domain/CMakeLists.txt b/framework/domain/CMakeLists.txt index 38e0eb12..e1482301 100644 --- a/framework/domain/CMakeLists.txt +++ b/framework/domain/CMakeLists.txt @@ -34,8 +34,8 @@ 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 KAsync) -add_subdirectory(actions/tests) install(TARGETS mailplugin DESTINATION ${FRAMEWORK_INSTALL_DIR}) +add_subdirectory(actions/tests) add_subdirectory(mimetreeparser) diff --git a/framework/domain/actions/tests/CMakeLists.txt b/framework/domain/actions/tests/CMakeLists.txt index dc9d01b1..2c34d628 100644 --- a/framework/domain/actions/tests/CMakeLists.txt +++ b/framework/domain/actions/tests/CMakeLists.txt @@ -3,4 +3,4 @@ cmake_policy(SET CMP0063 NEW) add_executable(sinkactiontest sinkactiontest.cpp) add_test(sinkactiontest sinkactiontest) qt5_use_modules(sinkactiontest Core Test Concurrent) -target_link_libraries(sinkactiontest sink actionplugin KF5::Mime mailplugin) +target_link_libraries(sinkactiontest sink frameworkplugin KF5::Mime) diff --git a/framework/domain/mailplugin.cpp b/framework/domain/mailplugin.cpp index 12b9a7ce..b32832e0 100644 --- a/framework/domain/mailplugin.cpp +++ b/framework/domain/mailplugin.cpp @@ -37,8 +37,6 @@ void MailPlugin::registerTypes (const char *uri) { - Q_ASSERT(uri == QLatin1String("org.kube.framework.domain")); - qmlRegisterType(uri, 1, 0, "FolderListModel"); qmlRegisterType(uri, 1, 0, "MailListModel"); qmlRegisterType(uri, 1, 0, "ComposerController"); -- cgit v1.2.3