From 49c28f52dfc8391781a2b262092ed8e7a01e9111 Mon Sep 17 00:00:00 2001
From: Patrick von Reth <vonreth@kde.org>
Date: Fri, 23 Jan 2015 13:24:09 +0100
Subject: [PATCH] lik to okularcore and okularpart instead of including the
 settings code multiple times, which breaks the exports

---
 active/components/CMakeLists.txt | 4 +---
 generators/kimgio/CMakeLists.txt | 3 +--
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/active/components/CMakeLists.txt b/active/components/CMakeLists.txt
index e27c330fa..402f18dde 100644
--- a/active/components/CMakeLists.txt
+++ b/active/components/CMakeLists.txt
@@ -10,7 +10,6 @@ include_directories(
 
 set(okular_SRCS
     okularplugin.cpp
-    ${CMAKE_SOURCE_DIR}/ui/pagepainter.cpp
     ${CMAKE_SOURCE_DIR}/ui/guiutils.cpp
     ${CMAKE_SOURCE_DIR}/ui/tocmodel.cpp
     pageitem.cpp
@@ -18,8 +17,6 @@ set(okular_SRCS
     thumbnailitem.cpp
     )
 
-kconfig_add_kcfg_files (okular_SRCS ${CMAKE_SOURCE_DIR}/conf/settings.kcfgc )
-
 qt4_automoc(${okular_SRCS})
 
 add_library(okularplugin SHARED ${okular_SRCS})
@@ -30,6 +27,7 @@ target_link_libraries(okularplugin
         Qt5::Xml
         Qt5::Svg
         okularcore
+        okularpart
         )
 
 install(TARGETS okularplugin DESTINATION ${QML_INSTALL_DIR}/org/kde/okular)
diff --git a/generators/kimgio/CMakeLists.txt b/generators/kimgio/CMakeLists.txt
index 14471daea..f10d86f06 100644
--- a/generators/kimgio/CMakeLists.txt
+++ b/generators/kimgio/CMakeLists.txt
@@ -13,8 +13,7 @@ install(TARGETS okularGenerator_kimgio DESTINATION ${PLUGIN_INSTALL_DIR})
 
 add_definitions( -DKDESRCDIR="${CMAKE_CURRENT_SOURCE_DIR}/" )
 set( kimgiotest_SRCS tests/kimgiotest.cpp ${CMAKE_SOURCE_DIR}/ui/pagepainter.cpp ${CMAKE_SOURCE_DIR}/ui/guiutils.cpp )
-kconfig_add_kcfg_files( kimgiotest_SRCS ${CMAKE_SOURCE_DIR}/conf/settings.kcfgc )
-ecm_add_test(${kimgiotest_SRCS} TEST_NAME "kimgiotest" LINK_LIBRARIES okularcore Qt5::Svg Qt5::Test)
+ecm_add_test(${kimgiotest_SRCS} TEST_NAME "kimgiotest" LINK_LIBRARIES okularcore okularpart Qt5::Svg Qt5::Test)
 
 ########### install files ###############