Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package kcalendarcore for openSUSE:Factory checked in at 2021-05-10 15:35:16 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kcalendarcore (Old) and /work/SRC/openSUSE:Factory/.kcalendarcore.new.2988 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kcalendarcore" Mon May 10 15:35:16 2021 rev:19 rq:891730 version:5.82.0 Changes: -------- --- /work/SRC/openSUSE:Factory/kcalendarcore/kcalendarcore.changes 2021-04-12 12:35:49.889245970 +0200 +++ /work/SRC/openSUSE:Factory/.kcalendarcore.new.2988/kcalendarcore.changes 2021-05-10 15:36:46.502180847 +0200 @@ -1,0 +2,11 @@ +Sat May 1 16:40:36 UTC 2021 - Christophe Giboudeaux <[email protected]> + +- Update to 5.82.0 + * New feature release + * For more details please see: + * https://kde.org/announcements/frameworks/5/5.82.0 +- Changes since 5.81.0: + * Fix mem leak found by asan + * Don't export UTC timezone as TZID=UTC + +------------------------------------------------------------------- Old: ---- kcalendarcore-5.81.0.tar.xz kcalendarcore-5.81.0.tar.xz.sig New: ---- kcalendarcore-5.82.0.tar.xz kcalendarcore-5.82.0.tar.xz.sig ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kcalendarcore.spec ++++++ --- /var/tmp/diff_new_pack.3lvgDB/_old 2021-05-10 15:36:46.994178846 +0200 +++ /var/tmp/diff_new_pack.3lvgDB/_new 2021-05-10 15:36:46.998178830 +0200 @@ -16,14 +16,14 @@ # -%define _tar_path 5.81 +%define _tar_path 5.82 # Full KF5 version (e.g. 5.33.0) %{!?_kf5_version: %global _kf5_version %{version}} # Last major and minor KF5 version (e.g. 5.33) %{!?_kf5_bugfix_version: %define _kf5_bugfix_version %(echo %{_kf5_version} | awk -F. '{print $1"."$2}')} %bcond_without lang Name: kcalendarcore -Version: 5.81.0 +Version: 5.82.0 Release: 0 Summary: Library to access and handle calendar data License: LGPL-2.0-or-later @@ -36,9 +36,9 @@ %endif BuildRequires: extra-cmake-modules >= %{_kf5_version} BuildRequires: cmake(LibIcal) >= 3.0 -BuildRequires: cmake(Qt5Core) >= 5.14.0 -BuildRequires: cmake(Qt5Gui) >= 5.14.0 -BuildRequires: cmake(Qt5Test) >= 5.14.0 +BuildRequires: cmake(Qt5Core) >= 5.15.0 +BuildRequires: cmake(Qt5Gui) >= 5.15.0 +BuildRequires: cmake(Qt5Test) >= 5.15.0 %description KCalendarCore is a library to provide access to and handling of calendar data. @@ -73,14 +73,14 @@ develop applications making use of KCalendarCore. %prep -%setup -q +%autosetup -p1 %build - %cmake_kf5 -d build - %cmake_build +%cmake_kf5 -d build +%cmake_build %install - %kf5_makeinstall -C build +%kf5_makeinstall -C build %post -n libKF5CalendarCore5 -p /sbin/ldconfig %postun -n libKF5CalendarCore5 -p /sbin/ldconfig ++++++ kcalendarcore-5.81.0.tar.xz -> kcalendarcore-5.82.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcalendarcore-5.81.0/.gitignore new/kcalendarcore-5.82.0/.gitignore --- old/kcalendarcore-5.81.0/.gitignore 2021-04-03 11:29:01.000000000 +0200 +++ new/kcalendarcore-5.82.0/.gitignore 2021-05-01 11:37:42.000000000 +0200 @@ -20,3 +20,6 @@ .cmake/ /.clang-format /compile_commands.json +.clangd +.idea +/cmake-build* diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcalendarcore-5.81.0/CMakeLists.txt new/kcalendarcore-5.82.0/CMakeLists.txt --- old/kcalendarcore-5.81.0/CMakeLists.txt 2021-04-03 11:29:01.000000000 +0200 +++ new/kcalendarcore-5.82.0/CMakeLists.txt 2021-05-01 11:37:42.000000000 +0200 @@ -1,17 +1,17 @@ cmake_minimum_required(VERSION 3.5) -set(KF_VERSION "5.81.0") # handled by release scripts +set(KF_VERSION "5.82.0") # handled by release scripts project(KCalendarCore VERSION ${KF_VERSION}) # ECM setup include(FeatureSummary) -find_package(ECM 5.81.0 NO_MODULE) +find_package(ECM 5.82.0 NO_MODULE) set_package_properties(ECM PROPERTIES TYPE REQUIRED DESCRIPTION "Extra CMake Modules." URL "https://commits.kde.org/extra-cmake-modules";) feature_summary(WHAT REQUIRED_PACKAGES_NOT_FOUND FATAL_ON_MISSING_REQUIRED_PACKAGES) set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${CMAKE_SOURCE_DIR}/cmake) -set(REQUIRED_QT_VERSION 5.14.0) +set(REQUIRED_QT_VERSION 5.15.0) include(KDEInstallDirs) include(KDECMakeSettings) @@ -68,7 +68,7 @@ ) -add_definitions(-DQT_DISABLE_DEPRECATED_BEFORE=0x050e00) +add_definitions(-DQT_DISABLE_DEPRECATED_BEFORE=0x050f00) add_definitions(-DQT_NO_FOREACH) @@ -76,7 +76,7 @@ add_subdirectory(src) if(BUILD_TESTING) - find_package(Qt5 ${QT_REQUIRED_VERSION} CONFIG REQUIRED Test) + find_package(Qt5 ${REQUIRED_QT_VERSION} CONFIG REQUIRED Test) add_subdirectory(autotests) endif() @@ -122,7 +122,3 @@ feature_summary(WHAT ALL FATAL_ON_MISSING_REQUIRED_PACKAGES) kde_configure_git_pre_commit_hook(CHECKS CLANG_FORMAT) -# Remove these 3 lines when the ECM version is bumped to 5.80 -include(KDEClangFormat) -file(GLOB_RECURSE ALL_CLANG_FORMAT_SOURCE_FILES *.cpp *.h) -kde_clang_format(${ALL_CLANG_FORMAT_SOURCE_FILES}) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcalendarcore-5.81.0/autotests/CMakeLists.txt new/kcalendarcore-5.82.0/autotests/CMakeLists.txt --- old/kcalendarcore-5.81.0/autotests/CMakeLists.txt 2021-04-03 11:29:01.000000000 +0200 +++ new/kcalendarcore-5.82.0/autotests/CMakeLists.txt 2021-05-01 11:37:42.000000000 +0200 @@ -1,6 +1,6 @@ include(ECMMarkAsTest) -find_package(Qt5Test ${QT_REQUIRED_VERSION} CONFIG REQUIRED) +find_package(Qt5Test ${REQUIRED_QT_VERSION} CONFIG REQUIRED) # needed by loadcalendar file(COPY ${CMAKE_CURRENT_SOURCE_DIR}/cal DESTINATION ${CMAKE_CURRENT_BINARY_DIR}) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcalendarcore-5.81.0/autotests/testevent.cpp new/kcalendarcore-5.82.0/autotests/testevent.cpp --- old/kcalendarcore-5.81.0/autotests/testevent.cpp 2021-04-03 11:29:01.000000000 +0200 +++ new/kcalendarcore-5.82.0/autotests/testevent.cpp 2021-05-01 11:37:42.000000000 +0200 @@ -58,16 +58,16 @@ void EventTest::testValidity() { QDate dt = QDate::currentDate(); - Event *event = new Event(); - event->setDtStart(QDateTime(dt, {})); - event->setDtEnd(QDateTime(dt, {}).addDays(1)); - event->setSummary(QStringLiteral("Event1 Summary")); - event->setDescription(QStringLiteral("This is a description of the first event")); - event->setLocation(QStringLiteral("the place")); - - QCOMPARE(event->summary(), QStringLiteral("Event1 Summary")); - QCOMPARE(event->location(), QStringLiteral("the place")); - QCOMPARE(event->type(), Incidence::TypeEvent); + Event event; + event.setDtStart(QDateTime(dt, {})); + event.setDtEnd(QDateTime(dt, {}).addDays(1)); + event.setSummary(QStringLiteral("Event1 Summary")); + event.setDescription(QStringLiteral("This is a description of the first event")); + event.setLocation(QStringLiteral("the place")); + + QCOMPARE(event.summary(), QStringLiteral("Event1 Summary")); + QCOMPARE(event.location(), QStringLiteral("the place")); + QCOMPARE(event.type(), Incidence::TypeEvent); } void EventTest::testCompare() @@ -108,6 +108,7 @@ QCOMPARE(event1.dtEnd(), event2->dtEnd()); QCOMPARE(event1.description(), event2->description()); QCOMPARE(event1.location(), event2->location()); + delete event2; } void EventTest::testCopy() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcalendarcore-5.81.0/autotests/testicalformat.cpp new/kcalendarcore-5.82.0/autotests/testicalformat.cpp --- old/kcalendarcore-5.81.0/autotests/testicalformat.cpp 2021-04-03 11:29:01.000000000 +0200 +++ new/kcalendarcore-5.82.0/autotests/testicalformat.cpp 2021-05-01 11:37:42.000000000 +0200 @@ -220,3 +220,40 @@ Alarm::Ptr alarm2 = event2->alarms()[0]; QCOMPARE(*alarm, *alarm2); } + +void ICalFormatTest::testDateTimeSerialization_data() +{ + QTest::addColumn<QDateTime>("dtStart"); + QTest::addColumn<QByteArray>("dtStartData"); + + QTest::newRow("UTC time spec") + << QDateTime(QDate(2021, 4, 9), QTime(12, 00), Qt::UTC) + << QByteArray("DTSTART:20210409T120000Z"); + QTest::newRow("UTC time zone") + << QDateTime(QDate(2021, 4, 9), QTime(12, 00), QTimeZone::utc()) + << QByteArray("DTSTART:20210409T120000Z"); + QTest::newRow("named time zone") + << QDateTime(QDate(2021, 4, 9), QTime(14, 00), QTimeZone("Europe/Paris")) + << QByteArray("DTSTART;TZID=Europe/Paris:20210409T140000"); +} + +void ICalFormatTest::testDateTimeSerialization() +{ + QFETCH(QDateTime, dtStart); + QFETCH(QByteArray, dtStartData); + + Incidence::Ptr event(new Event); + QVERIFY(event); + event->setDtStart(dtStart); + QCOMPARE(event->dtStart(), dtStart); + + ICalFormat format; + const QByteArray output = format.toRawString(event); + const QList<QByteArray> lines = output.split('\n'); + for (const QByteArray &line: lines) { + if (line.startsWith(QByteArray("DTSTART"))) { + QCOMPARE(line.chopped(1), dtStartData); + break; + } + } +} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcalendarcore-5.81.0/autotests/testicalformat.h new/kcalendarcore-5.82.0/autotests/testicalformat.h --- old/kcalendarcore-5.81.0/autotests/testicalformat.h 2021-04-03 11:29:01.000000000 +0200 +++ new/kcalendarcore-5.82.0/autotests/testicalformat.h 2021-05-01 11:37:42.000000000 +0200 @@ -21,6 +21,8 @@ void testVolatileProperties(); void testCuType(); void testAlarm(); + void testDateTimeSerialization_data(); + void testDateTimeSerialization(); }; #endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcalendarcore-5.81.0/autotests/testjournal.cpp new/kcalendarcore-5.82.0/autotests/testjournal.cpp --- old/kcalendarcore-5.81.0/autotests/testjournal.cpp 2021-04-03 11:29:01.000000000 +0200 +++ new/kcalendarcore-5.82.0/autotests/testjournal.cpp 2021-05-01 11:37:42.000000000 +0200 @@ -16,15 +16,15 @@ void JournalTest::testValidity() { QDate dt = QDate::currentDate(); - Journal *journal = new Journal(); - journal->setDtStart(QDateTime(dt, {})); - journal->setAllDay(true); - journal->setSummary(QStringLiteral("Journal Summary")); - journal->setDescription(QStringLiteral("This is a description of my journal")); - journal->setLocation(QStringLiteral("the place")); - QCOMPARE(journal->typeStr(), QByteArray("Journal")); - QVERIFY(journal->summary() == QLatin1String("Journal Summary")); - QVERIFY(journal->location() == QLatin1String("the place")); + Journal journal; + journal.setDtStart(QDateTime(dt, {})); + journal.setAllDay(true); + journal.setSummary(QStringLiteral("Journal Summary")); + journal.setDescription(QStringLiteral("This is a description of my journal")); + journal.setLocation(QStringLiteral("the place")); + QCOMPARE(journal.typeStr(), QByteArray("Journal")); + QVERIFY(journal.summary() == QLatin1String("Journal Summary")); + QVERIFY(journal.location() == QLatin1String("the place")); } void JournalTest::testCompare() @@ -63,6 +63,7 @@ QVERIFY(journal1.dtStart() == journal2->dtStart()); QVERIFY(journal1.description() == journal2->description()); QVERIFY(journal1.location() == journal2->location()); + delete journal2; } void JournalTest::testRich() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcalendarcore-5.81.0/autotests/testrecurrence.cpp new/kcalendarcore-5.82.0/autotests/testrecurrence.cpp --- old/kcalendarcore-5.81.0/autotests/testrecurrence.cpp 2021-04-03 11:29:01.000000000 +0200 +++ new/kcalendarcore-5.82.0/autotests/testrecurrence.cpp 2021-05-01 11:37:42.000000000 +0200 @@ -60,6 +60,7 @@ QTimeZone viewZone; FileStorage store(cal, input); if (!store.load()) { + delete outstream; return 1; } QString tz = cal->nonKDECustomProperty("X-LibKCal-Testsuite-OutTZ"); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcalendarcore-5.81.0/autotests/testrecurtodo.cpp new/kcalendarcore-5.82.0/autotests/testrecurtodo.cpp --- old/kcalendarcore-5.81.0/autotests/testrecurtodo.cpp 2021-04-03 11:29:01.000000000 +0200 +++ new/kcalendarcore-5.82.0/autotests/testrecurtodo.cpp 2021-05-01 11:37:42.000000000 +0200 @@ -34,33 +34,33 @@ QCOMPARE(currentDate, dueDate); QCOMPARE(currentDate, currentUtcDateTime.date()); - Todo *todo = new Todo(); - todo->setDtStart(QDateTime(dueDate.addDays(-1), {})); - todo->setDtDue(QDateTime(dueDate, {})); - todo->setSummary(QStringLiteral("All day event")); - todo->setAllDay(true); + Todo todo; + todo.setDtStart(QDateTime(dueDate.addDays(-1), {})); + todo.setDtDue(QDateTime(dueDate, {})); + todo.setSummary(QStringLiteral("All day event")); + todo.setAllDay(true); - QCOMPARE(todo->dtStart().daysTo(todo->dtDue()), 1); - QVERIFY(!todo->recurs()); + QCOMPARE(todo.dtStart().daysTo(todo.dtDue()), 1); + QVERIFY(!todo.recurs()); - Recurrence *recurrence = todo->recurrence(); + Recurrence *recurrence = todo.recurrence(); recurrence->unsetRecurs(); recurrence->setDaily(1); - QCOMPARE(todo->dtDue(), QDateTime(dueDate, {})); - QCOMPARE(todo->percentComplete(), 0); - QVERIFY(todo->recurs()); // Previously it did not recur - todo->setCompleted(currentUtcDateTime); - QVERIFY(todo->recurs()); - QCOMPARE(todo->percentComplete(), 0); // It is still not done - const QDate newStartDate = todo->dtStart().date(); - const QDate newDueDate = todo->dtDue().date(); + QCOMPARE(todo.dtDue(), QDateTime(dueDate, {})); + QCOMPARE(todo.percentComplete(), 0); + QVERIFY(todo.recurs()); // Previously it did not recur + todo.setCompleted(currentUtcDateTime); + QVERIFY(todo.recurs()); + QCOMPARE(todo.percentComplete(), 0); // It is still not done + const QDate newStartDate = todo.dtStart().date(); + const QDate newDueDate = todo.dtDue().date(); QCOMPARE(newStartDate, currentDate); QCOMPARE(newStartDate.daysTo(newDueDate), 1); - todo->setCompleted(currentUtcDateTime); + todo.setCompleted(currentUtcDateTime); QCOMPARE(newDueDate, currentDate.addDays(1)); - QCOMPARE(todo->dtDue(true /*first ocurrence*/).date(), dueDate); + QCOMPARE(todo.dtDue(true /*first ocurrence*/).date(), dueDate); } void RecurTodoTest::testRecurrenceStart() @@ -74,15 +74,15 @@ const QDate treeDaysAgo(currentDate.addDays(-3)); const QTime currentTime(currentTimeWithMS.hour(), currentTimeWithMS.minute(), currentTimeWithMS.second()); - Todo *todo = new Todo(); - Recurrence *recurrence = todo->recurrence(); + Todo todo; + Recurrence *recurrence = todo.recurrence(); recurrence->unsetRecurs(); recurrence->setDaily(1); - todo->setDtStart(QDateTime(fourDaysAgo, currentTime)); + todo.setDtStart(QDateTime(fourDaysAgo, currentTime)); const QDateTime originalDtDue(treeDaysAgo, currentTime); - todo->setDtDue(originalDtDue); - todo->setSummary(QStringLiteral("Not an all day event")); - QVERIFY(!todo->allDay()); + todo.setDtDue(originalDtDue); + todo.setSummary(QStringLiteral("Not an all day event")); + QVERIFY(!todo.allDay()); QVERIFY(recurrence->startDateTime().isValid()); } @@ -97,32 +97,32 @@ const QDate treeDaysAgo(currentDate.addDays(-3)); const QTime currentTime(currentTimeWithMS.hour(), currentTimeWithMS.minute(), currentTimeWithMS.second()); - Todo *todo = new Todo(); - todo->setDtStart(QDateTime(fourDaysAgo, currentTime)); + Todo todo; + todo.setDtStart(QDateTime(fourDaysAgo, currentTime)); const QDateTime originalDtDue(treeDaysAgo, currentTime); - todo->setDtDue(originalDtDue); - todo->setSummary(QStringLiteral("Not an all day event")); - QVERIFY(!todo->allDay()); - Recurrence *recurrence = todo->recurrence(); + todo.setDtDue(originalDtDue); + todo.setSummary(QStringLiteral("Not an all day event")); + QVERIFY(!todo.allDay()); + Recurrence *recurrence = todo.recurrence(); recurrence->unsetRecurs(); recurrence->setDaily(1); QVERIFY(recurrence->startDateTime().isValid()); - QCOMPARE(todo->dtDue(), originalDtDue); - todo->setCompleted(QDateTime::currentDateTimeUtc()); - QVERIFY(todo->recurs()); - QVERIFY(todo->percentComplete() == 0); + QCOMPARE(todo.dtDue(), originalDtDue); + todo.setCompleted(QDateTime::currentDateTimeUtc()); + QVERIFY(todo.recurs()); + QVERIFY(todo.percentComplete() == 0); - const bool equal = todo->dtStart() == QDateTime(currentDate, currentTime, todo->dtStart().timeZone()).addDays(1); + const bool equal = todo.dtStart() == QDateTime(currentDate, currentTime, todo.dtStart().timeZone()).addDays(1); if (!equal) { - qDebug() << "Test Failed. dtDue = " << todo->dtDue().toString() << "OriginalDtDue:" << originalDtDue.toString() - << "QDateTime:" << QDateTime(currentDate, currentTime, todo->dtDue().timeZone()).addDays(1).toString(); + qDebug() << "Test Failed. dtDue = " << todo.dtDue().toString() << "OriginalDtDue:" << originalDtDue.toString() + << "QDateTime:" << QDateTime(currentDate, currentTime, todo.dtDue().timeZone()).addDays(1).toString(); } QVERIFY(equal); - todo->setCompleted(QDateTime::currentDateTimeUtc()); - QCOMPARE(todo->dtStart(), QDateTime(currentDate, currentTime, todo->dtStart().timeZone()).addDays(2)); - QCOMPARE(todo->dtDue(true /*first ocurrence*/), QDateTime(treeDaysAgo, currentTime)); + todo.setCompleted(QDateTime::currentDateTimeUtc()); + QCOMPARE(todo.dtStart(), QDateTime(currentDate, currentTime, todo.dtStart().timeZone()).addDays(2)); + QCOMPARE(todo.dtDue(true /*first ocurrence*/), QDateTime(treeDaysAgo, currentTime)); } void RecurTodoTest::testIsAllDay() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcalendarcore-5.81.0/autotests/testtimesininterval.cpp new/kcalendarcore-5.82.0/autotests/testtimesininterval.cpp --- old/kcalendarcore-5.81.0/autotests/testtimesininterval.cpp 2021-04-03 11:29:01.000000000 +0200 +++ new/kcalendarcore-5.82.0/autotests/testtimesininterval.cpp 2021-05-01 11:37:42.000000000 +0200 @@ -19,18 +19,18 @@ void TimesInIntervalTest::test() { const QDateTime currentDate(QDate::currentDate(), {}); - Event *event = new Event(); - event->setDtStart(currentDate); - event->setDtEnd(currentDate.addDays(1)); - event->setAllDay(true); - event->setSummary(QStringLiteral("Event1 Summary")); + Event event; + event.setDtStart(currentDate); + event.setDtEnd(currentDate.addDays(1)); + event.setAllDay(true); + event.setSummary(QStringLiteral("Event1 Summary")); - event->recurrence()->setDaily(1); + event.recurrence()->setDaily(1); //------------------------------------------------------------------------------------------------ // Just to warm up - QVERIFY(event->recurs()); - QVERIFY(event->recursAt(currentDate)); + QVERIFY(event.recurs()); + QVERIFY(event.recursAt(currentDate)); //------------------------------------------------------------------------------------------------ // Daily recurrence that never stops. @@ -41,22 +41,22 @@ start.setTime(QTime(0, 0, 0)); end.setTime(QTime(23, 59, 59)); - auto dateList = event->recurrence()->timesInInterval(start, end); + auto dateList = event.recurrence()->timesInInterval(start, end); QVERIFY(dateList.count() == numDaysInInterval + 1); //------------------------------------------------------------------------------------------------ // start == end == first day of the recurrence, should only return 1 occurrence end = start; end.setTime(QTime(23, 59, 59)); - dateList = event->recurrence()->timesInInterval(start, end); + dateList = event.recurrence()->timesInInterval(start, end); QVERIFY(dateList.count() == 1); //------------------------------------------------------------------------------------------------ // Test daily recurrence that only lasts X days const int recurrenceDuration = 3; - event->recurrence()->setDuration(recurrenceDuration); + event.recurrence()->setDuration(recurrenceDuration); end = start.addDays(100); - dateList = event->recurrence()->timesInInterval(start, end); + dateList = event.recurrence()->timesInInterval(start, end); QVERIFY(dateList.count() == recurrenceDuration); //------------------------------------------------------------------------------------------------ // Test daily recurrence that only lasts X days, and give start == end == last day of @@ -66,7 +66,7 @@ start.setTime(QTime(0, 0, 0)); end.setTime(QTime(23, 59, 59)); - dateList = event->recurrence()->timesInInterval(start, end); + dateList = event.recurrence()->timesInInterval(start, end); QVERIFY(dateList.count() == 1); //------------------------------------------------------------------------------------------------ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcalendarcore-5.81.0/autotests/testtodo.cpp new/kcalendarcore-5.82.0/autotests/testtodo.cpp --- old/kcalendarcore-5.81.0/autotests/testtodo.cpp 2021-04-03 11:29:01.000000000 +0200 +++ new/kcalendarcore-5.82.0/autotests/testtodo.cpp 2021-05-01 11:37:42.000000000 +0200 @@ -23,17 +23,17 @@ void TodoTest::testValidity() { QDate dt = QDate::currentDate(); - Todo *todo = new Todo(); - todo->setDtStart(QDateTime(dt, {})); - todo->setDtDue(QDateTime(dt, {}).addDays(1)); - todo->setSummary(QStringLiteral("To-do1 Summary")); - todo->setDescription(QStringLiteral("This is a description of the first to-do")); - todo->setLocation(QStringLiteral("the place")); - todo->setPercentComplete(5); - - QCOMPARE(todo->summary(), QStringLiteral("To-do1 Summary")); - QCOMPARE(todo->location(), QStringLiteral("the place")); - QCOMPARE(todo->percentComplete(), 5); + Todo todo; + todo.setDtStart(QDateTime(dt, {})); + todo.setDtDue(QDateTime(dt, {}).addDays(1)); + todo.setSummary(QStringLiteral("To-do1 Summary")); + todo.setDescription(QStringLiteral("This is a description of the first to-do")); + todo.setLocation(QStringLiteral("the place")); + todo.setPercentComplete(5); + + QCOMPARE(todo.summary(), QStringLiteral("To-do1 Summary")); + QCOMPARE(todo.location(), QStringLiteral("the place")); + QCOMPARE(todo.percentComplete(), 5); } void TodoTest::testCompare() @@ -78,6 +78,7 @@ QCOMPARE(todo1.description(), todo2->description()); QCOMPARE(todo1.location(), todo2->location()); QCOMPARE(todo1.isCompleted(), todo2->isCompleted()); + delete todo2; } void TodoTest::testCopyIncidence() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcalendarcore-5.81.0/src/icalformat_p.cpp new/kcalendarcore-5.82.0/src/icalformat_p.cpp --- old/kcalendarcore-5.81.0/src/icalformat_p.cpp 2021-04-03 11:29:01.000000000 +0200 +++ new/kcalendarcore-5.82.0/src/icalformat_p.cpp 2021-05-01 11:37:42.000000000 +0200 @@ -2334,13 +2334,11 @@ t.second = datetime.time().second(); } t.zone = nullptr; // zone is NOT set -#if defined(USE_ICAL_3) - if (datetime.timeSpec() == Qt::UTC || (datetime.timeSpec() == Qt::OffsetFromUTC && datetime.offsetFromUtc() == 0)) { + if (datetime.timeSpec() == Qt::UTC || + (datetime.timeSpec() == Qt::TimeZone && datetime.timeZone() == QTimeZone::utc()) || + (datetime.timeSpec() == Qt::OffsetFromUTC && datetime.offsetFromUtc() == 0)) { t = icaltime_convert_to_zone(t, icaltimezone_get_utc_timezone()); } -#else - t.is_utc = datetime.timeSpec() == Qt::UTC || (datetime.timeSpec() == Qt::OffsetFromUTC && datetime.offsetFromUtc() == 0); -#endif return t; }
