summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVolker Krause <[email protected]>2017-09-09 16:43:50 +0200
committerVolker Krause <[email protected]>2017-09-09 16:43:50 +0200
commit325b5add53df99a0a46c2fc39286bcaca597f7c6 (patch)
tree8a8555dfcabb5ed02d68d22693b42b9ec990a3f7
parent3455e6ba407588dabbedde2b38a87fa844cd7ffa (diff)
Adapt to KCalUtils changes
-rw-r--r--CMakeLists.txt2
-rw-r--r--src/incidencedatetime.cpp9
2 files changed, 4 insertions, 7 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index b2e2f95..a862cae 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -41,7 +41,7 @@ set(QT_REQUIRED_VERSION "5.8.0")
set(KMIME_LIB_VERSION "5.6.40")
set(KMAILTRANSPORT_LIB_VERSION "5.6.40")
set(KLDAP_LIB_VERSION "5.6.40")
-set(CALENDARUTILS_LIB_VERSION "5.6.40")
+set(CALENDARUTILS_LIB_VERSION "5.6.42")
set(KCALENDARCORE_LIB_VERSION "5.6.40")
set(CALENDARSUPPORT_LIB_VERSION "5.6.40")
set(LIBKDEPIM_LIB_VERSION "5.6.40")
diff --git a/src/incidencedatetime.cpp b/src/incidencedatetime.cpp
index 67e64d1..693d5f0 100644
--- a/src/incidencedatetime.cpp
+++ b/src/incidencedatetime.cpp
@@ -20,14 +20,13 @@
#include "incidencedatetime.h"
#include "ui_dialogdesktop.h"
+#include "incidenceeditor_debug.h"
#include <CalendarSupport/KCalPrefs>
#include <KCalCore/ICalTimeZones>
#include <KCalUtils/IncidenceFormatter>
-#include "incidenceeditor_debug.h"
-#include <KSystemTimeZone>
#include <QTimeZone>
using namespace IncidenceEditorNG;
@@ -851,8 +850,7 @@ void IncidenceDateTime::updateStartToolTips()
= KCalUtils::IncidenceFormatter::dateTimeToString(
currentStartDateTime(),
mUi->mWholeDayCheck->isChecked(),
- false,
- KSystemTimeZones::local());
+ false);
mUi->mStartDateEdit->setToolTip(i18n("Starts: %1", datetimeStr));
mUi->mStartTimeEdit->setToolTip(i18n("Starts: %1", datetimeStr));
} else {
@@ -868,8 +866,7 @@ void IncidenceDateTime::updateEndToolTips()
= KCalUtils::IncidenceFormatter::dateTimeToString(
currentEndDateTime(),
mUi->mWholeDayCheck->isChecked(),
- false,
- KSystemTimeZones::local());
+ false);
if (mLoadedIncidence->type() == KCalCore::Incidence::TypeTodo) {
mUi->mEndDateEdit->setToolTip(i18n("Due on: %1", datetimeStr));
mUi->mEndTimeEdit->setToolTip(i18n("Due on: %1", datetimeStr));