From 7efa189b0de87ac6a5ff0e5f333660545b90077e Mon Sep 17 00:00:00 2001 From: Albert Astals Cid Date: Mon, 18 Jul 2011 12:44:55 +0200 Subject: [PATCH] Load the libeventviews catalog (cherry picked from commit 94528a201379fa75abf58f85d36cec9e20c8a706) --- CMakeLists.txt | 2 +- calendarviews/eventviews/eventview.cpp | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 84eb907491..ed55e08269 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -130,7 +130,7 @@ if(WINCE) find_program(KDE4_KDECONFIG_EXECUTABLE NAMES kde4-config PATHS ${HOST_BINDIR} NO_DEFAULT_PATH) endif(WINCE) -find_package(KDE4 REQUIRED) +find_package(KDE4 4.6.2 REQUIRED) include(KDE4Defaults) include(MacroLibrary) include(CheckIncludeFiles) diff --git a/calendarviews/eventviews/eventview.cpp b/calendarviews/eventviews/eventview.cpp index 20aeab6e0b..9a798c4bc7 100644 --- a/calendarviews/eventviews/eventview.cpp +++ b/calendarviews/eventviews/eventview.cpp @@ -46,6 +46,7 @@ #include #include +#include #include #include #include @@ -59,6 +60,8 @@ using namespace EventViews; using namespace Akonadi; using namespace Future; +static const KCatalogLoader loader("libeventviews"); + CalendarSupport::CollectionSelection *EventViewPrivate::sGlobalCollectionSelection = 0; /* static */ -- 2.11.4.GIT