From d8de6ec84d0d4d0a0a48a44590dde2797fe7cc09 Mon Sep 17 00:00:00 2001 From: Robin Burchell Date: Thu, 1 Nov 2012 11:36:07 +0000 Subject: Revert "compile on MeeGo" This reverts commit ba9c12987e1294d66da1c992c1abb3f029108b19. Mer (the continuation of MeeGo) now has Harmattan's mkcal again, so this patch is unnecessary. Change-Id: Ic63efc947b86b10806d48d2e31773b7aca920263 Reviewed-by: Lorn Potter --- plugins/organizer/mkcal/mkcalengine.cpp | 4 ---- 1 file changed, 4 deletions(-) diff --git a/plugins/organizer/mkcal/mkcalengine.cpp b/plugins/organizer/mkcal/mkcalengine.cpp index 8ab726cdf4..6e10ed9c6b 100644 --- a/plugins/organizer/mkcal/mkcalengine.cpp +++ b/plugins/organizer/mkcal/mkcalengine.cpp @@ -232,11 +232,7 @@ QList MKCalEngine::internalItemOccurrences(const QOrganizerItem& maxCount); KCalCore::Recurrence *recurrence = generatorIncidence->recurrence(); foreach (const mKCal::ExtendedCalendar::ExpandedIncidence& expandedIncidence, incidenceList) { -#ifdef Q_WS_MEEGO - QDateTime incidenceDateTime = expandedIncidence.first; -#else QDateTime incidenceDateTime = expandedIncidence.first.dtStart; -#endif KCalCore::Incidence::Ptr incidence = expandedIncidence.second; QOrganizerItem instance; //unfortunately sometimes expandRecurrences will include also those occurrences which are in exDates -- cgit v1.2.3