From bc4c19eb9233eb45304ebf135c694e64d5efa7b0 Mon Sep 17 00:00:00 2001 From: Volker Krause Date: Fri, 15 Feb 2019 15:00:56 +0100 Subject: [PATCH] Remove dependency on okularpart from the mobile components Summary: This only depended on okularpart due to the export header used in the kcfgc file, so use a dedicated one for the mobile components that doesn't export anything. This enables disabling the part build for mobile-only builds such as Android, and thus removing the need for some difficult dependencies like KParts. Reviewers: aacid Reviewed By: aacid Subscribers: aacid, okular-devel Tags: #okular Differential Revision: https://phabricator.kde.org/D19037 --- conf/settings_mobile.kcfgc | 10 ++++++++++ mobile/components/CMakeLists.txt | 2 +- mobile/components/settings.h | 1 + 3 files changed, 12 insertions(+), 1 deletion(-) create mode 100644 conf/settings_mobile.kcfgc create mode 100644 mobile/components/settings.h diff --git a/conf/settings_mobile.kcfgc b/conf/settings_mobile.kcfgc new file mode 100644 index 000000000..737ff6594 --- /dev/null +++ b/conf/settings_mobile.kcfgc @@ -0,0 +1,10 @@ +ClassName=Settings +NameSpace=Okular +File=okular.kcfg +Inherits=SettingsCore +Mutators=true +Singleton=true +Visibility= +IncludeFiles=settings_core.h +SourceIncludeFiles=qdom.h,QStandardPaths +MemberVariables=dpointer diff --git a/mobile/components/CMakeLists.txt b/mobile/components/CMakeLists.txt index f2529f78a..88c9b7ac5 100644 --- a/mobile/components/CMakeLists.txt +++ b/mobile/components/CMakeLists.txt @@ -20,7 +20,7 @@ set(okular_SRCS okularsingleton.cpp ) -kconfig_add_kcfg_files(okular_SRCS ${CMAKE_SOURCE_DIR}/conf/settings.kcfgc ) +kconfig_add_kcfg_files(okular_SRCS ${CMAKE_SOURCE_DIR}/conf/settings_mobile.kcfgc) add_library(okularplugin SHARED ${okular_SRCS}) set_target_properties(okularplugin PROPERTIES COMPILE_DEFINITIONS "okularpart_EXPORTS") diff --git a/mobile/components/settings.h b/mobile/components/settings.h new file mode 100644 index 000000000..e81a2ea57 --- /dev/null +++ b/mobile/components/settings.h @@ -0,0 +1 @@ +#include "settings_mobile.h"