Blame 0207-calendar-Adjust-to-new-KCalCore-API-fixes-CI.patch
|
 |
21519cf |
From 12ab7af4618f10d39d4a977e00a0e68a3aac9bd2 Mon Sep 17 00:00:00 2001
|
|
|
21519cf |
From: Simon Frei <freisim93@gmail.com>
|
|
|
21519cf |
Date: Wed, 13 Sep 2017 15:43:49 +0200
|
|
|
21519cf |
Subject: [PATCH 207/489] calendar: Adjust to new KCalCore API (fixes CI)
|
|
|
21519cf |
|
|
|
21519cf |
---
|
|
|
21519cf |
utilities/assistants/calendar/print/calsettings.cpp | 9 +++++++--
|
|
|
21519cf |
1 file changed, 7 insertions(+), 2 deletions(-)
|
|
|
21519cf |
|
|
|
21519cf |
diff --git a/utilities/assistants/calendar/print/calsettings.cpp b/utilities/assistants/calendar/print/calsettings.cpp
|
|
|
21519cf |
index b0bed5aa7f..46e995de72 100644
|
|
|
21519cf |
--- a/utilities/assistants/calendar/print/calsettings.cpp
|
|
|
21519cf |
+++ b/utilities/assistants/calendar/print/calsettings.cpp
|
|
|
21519cf |
@@ -31,12 +31,17 @@
|
|
|
21519cf |
#include "digikam_debug.h"
|
|
|
21519cf |
#include "calsystem.h"
|
|
|
21519cf |
|
|
|
21519cf |
-// KCalCore includes
|
|
|
21519cf |
|
|
|
21519cf |
#ifdef HAVE_KCALENDAR
|
|
|
21519cf |
+ // KCalCore includes
|
|
|
21519cf |
+
|
|
|
21519cf |
# include <kcalcore/icalformat.h>
|
|
|
21519cf |
# include <kcalcore/filestorage.h>
|
|
|
21519cf |
# include <kcalcore/memorycalendar.h>
|
|
|
21519cf |
+
|
|
|
21519cf |
+ // Qt includes
|
|
|
21519cf |
+
|
|
|
21519cf |
+# include <QTimeZone>
|
|
|
21519cf |
#endif // HAVE_KCALENDAR
|
|
|
21519cf |
|
|
|
21519cf |
namespace Digikam
|
|
|
21519cf |
@@ -290,7 +295,7 @@ void CalSettings::loadSpecial(const QUrl& url, const QColor& color)
|
|
|
21519cf |
return;
|
|
|
21519cf |
}
|
|
|
21519cf |
|
|
|
21519cf |
- KCalCore::MemoryCalendar::Ptr memCal(new KCalCore::MemoryCalendar(QString::fromLatin1("UTC")));
|
|
|
21519cf |
+ KCalCore::MemoryCalendar::Ptr memCal(new KCalCore::MemoryCalendar(QTimeZone(0)));
|
|
|
21519cf |
KCalCore::FileStorage::Ptr fileStorage(new KCalCore::FileStorage(memCal, url.toLocalFile(), new KCalCore::ICalFormat));
|
|
|
21519cf |
|
|
|
21519cf |
qCDebug(DIGIKAM_GENERAL_LOG) << "Loading calendar from file " << url.toLocalFile();
|
|
|
21519cf |
--
|
|
|
21519cf |
2.14.3
|
|
|
21519cf |
|