summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRobin Burchell <robin+git@viroteck.net>2012-11-01 11:36:07 +0000
committerRobin Burchell <robin+qt@viroteck.net>2012-11-07 22:41:00 +0100
commitd8de6ec84d0d4d0a0a48a44590dde2797fe7cc09 (patch)
treeb8cf1d1988e2994d093d48d4584b9522820e2d48
parent182969371548eb3c17f7fe605898cdb2588b9226 (diff)
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 <lorn.potter@gmail.com>
-rw-r--r--plugins/organizer/mkcal/mkcalengine.cpp4
1 files changed, 0 insertions, 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<QOrganizerItem> 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