Commit d1ae4bb6 authored by Laurent Montel's avatar Laurent Montel 😁

Port to qt5

parent ac9b701b
......@@ -19,7 +19,7 @@ include(KDEFrameworkCompilerSettings NO_POLICY_SCOPE)
include(ECMQtDeclareLoggingCategory)
include(ECMAddTests)
set(PIM_VERSION "5.3.41")
set(PIM_VERSION "5.3.42")
set(CALENDARSUPPORT_LIB_VERSION ${PIM_VERSION})
set(AKONADI_MIMELIB_VERSION "5.3.40")
......@@ -27,7 +27,7 @@ set(KDEPIM_LIB_VERSION "5.3.40")
set(QT_REQUIRED_VERSION "5.5.0")
set(KMIME_LIB_VERSION "5.3.40")
set(CALENDARUTILS_LIB_VERSION "5.3.40")
set(KCALENDARCORE_LIB_VERSION "5.3.40")
set(KCALENDARCORE_LIB_VERSION "5.3.41")
set(IDENTITYMANAGEMENT_LIB_VERSION "5.3.40")
set(KHOLIDAYS_LIB_VERSION "5.3.40")
set(AKONADICALENDAR_LIB_VERSION "5.3.40")
......
......@@ -113,7 +113,7 @@ KCalCore::Period::List FreePeriodModel::splitPeriodsByDay(
continue;
}
const int validPeriodSecs = 5 * 60; // 5 minutes
const int validPeriodSecs = 300; // 5 minutes
KCalCore::Period tmpPeriod = period;
while (tmpPeriod.start().date() != tmpPeriod.end().date()) {
const KDateTime midnight(tmpPeriod.start().date(), QTime(23, 59, 59, 999),
......@@ -132,15 +132,10 @@ KCalCore::Period::List FreePeriodModel::splitPeriodsByDay(
// Perform some jiggery pokery to remove duplicates
#pragma message("port to QT5")
#if 0 //QT5 FIX ME
QList<KCalCore::Period> tmpList = splitList.toList();
QSet<KCalCore::Period>set = tmpList.toSet();
const QSet<KCalCore::Period> set = tmpList.toSet();
tmpList = QList<KCalCore::Period>::fromSet(set);
return KCalCore::Period::List::fromList(tmpList);
#else
return splitList;
#endif
}
QString FreePeriodModel::day(int index) const
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment