Prefer QDate::startOfDay() over QDateTime(const QDate &)

The latter is deprecated, the former does something sensible.
Also use startOfDay() and endOfDay() rather than QTime(0, 0) or QTime(23, 59, 59).

Change-Id: Id1bc510833bfd2274e9945ab24c16ae07f3bd14e
Reviewed-by: Alberto Mardegan <mardy@users.sourceforge.net>
Reviewed-by: Christopher Adams <chris.adams@jolla.com>

11 files changed, 156 insertions, 157 deletions

diff --git a/examples/organizer/calendardemo/src/daypage.cpp b/examples/organizer/calendardemo/src/daypage.cpp
index e82a7bb74..7ad595b55 100644
--- a/examples/organizer/calendardemo/src/daypage.cpp
+++ b/examples/organizer/calendardemo/src/daypage.cpp
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2017 The Qt Company Ltd.
+** Copyright (C) 2020 The Qt Company Ltd.
 ** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the examples for the Qt PIM module of the Qt Toolkit.
@@ -104,7 +104,8 @@ void DayPage::refresh()
     m_itemList->clear();
 
     // Today's item
-    QList<QOrganizerItem> items = m_manager->items(QDateTime(m_day), QDateTime(m_day, QTime(23, 59, 59)));
+    QList<QOrganizerItem> items
+        = m_manager->items(m_day.startOfDay(), m_day.endOfDay());
 
     foreach (const QOrganizerItem &item, items)
     {
diff --git a/examples/organizer/todo/window.cpp b/examples/organizer/todo/window.cpp
index 97c9d275f..ecdbe2cc1 100644
--- a/examples/organizer/todo/window.cpp
+++ b/examples/organizer/todo/window.cpp
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2017 The Qt Company Ltd.
+** Copyright (C) 2020 The Qt Company Ltd.
 ** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the examples for the Qt PIM module of the Qt Toolkit.
@@ -149,10 +149,8 @@ void Window::refreshList()
     foreach(QOrganizerItem item, items) {
         if (item.type() == QOrganizerItemType::TypeTodo) {
             QOrganizerTodo todo = static_cast<QOrganizerTodo>(item);
-            if (todo.startDateTime() >
-                    QDateTime(calendarWidget->selectedDate(), QTime(23,59)) ||
-                todo.dueDateTime() <
-                    QDateTime(calendarWidget->selectedDate(), QTime(0, 0)))
+            if (todo.startDateTime() > calendarWidget->selectedDate().endOfDay() ||
+                todo.dueDateTime() < calendarWidget->selectedDate().startOfDay())
                 continue;
 
             QString display = todo.startDateTime().toString("yy/MM/dd hh:mm") +
diff --git a/src/contacts/details/qcontactdetails.cpp b/src/contacts/details/qcontactdetails.cpp
index c439bedea..d8f2ce166 100644
--- a/src/contacts/details/qcontactdetails.cpp
+++ b/src/contacts/details/qcontactdetails.cpp
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2017 The Qt Company Ltd.
+** Copyright (C) 2020 The Qt Company Ltd.
 ** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtContacts module of the Qt Toolkit.
@@ -469,7 +469,7 @@ QDate QContactAnniversary::originalDate() const
  */
 void QContactAnniversary::setOriginalDate(const QDate& _value)
 {
-    reinterpret_cast<QContactAnniversaryPrivate*>(d.data())->setMemberValue<QDateTime>(QContactAnniversary::FieldOriginalDate, QDateTime(_value));
+    reinterpret_cast<QContactAnniversaryPrivate*>(d.data())->setMemberValue<QDateTime>(QContactAnniversary::FieldOriginalDate, _value.startOfDay());
 }
 
 /*!
@@ -1187,7 +1187,7 @@ QDate QContactBirthday::date() const
  */
 void QContactBirthday::setDate(const QDate& _value)
 {
-    reinterpret_cast<QContactBirthdayPrivate*>(d.data())->setMemberValue<QDateTime>(QContactBirthday::FieldBirthday, QDateTime(_value));
+    reinterpret_cast<QContactBirthdayPrivate*>(d.data())->setMemberValue<QDateTime>(QContactBirthday::FieldBirthday, _value.startOfDay());
 }
 
 /*!
diff --git a/src/organizer/doc/snippets/qtorganizerdocsample/qtorganizerdocsample.cpp b/src/organizer/doc/snippets/qtorganizerdocsample/qtorganizerdocsample.cpp
index 13d3b0446..918297efa 100644
--- a/src/organizer/doc/snippets/qtorganizerdocsample/qtorganizerdocsample.cpp
+++ b/src/organizer/doc/snippets/qtorganizerdocsample/qtorganizerdocsample.cpp
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
+** Copyright (C) 2020 The Qt Company Ltd.
 ** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the documentation for the Qt Toolkit.
@@ -144,8 +144,8 @@ void snippets()
 
     //! [Retrieving entries for a time period]
     QList<QOrganizerItem> entries =
-        defaultManager.items(QDateTime(QDate(2010, 1, 1), QTime(0, 0, 0)),
-                             QDateTime(QDate(2010, 1, 31), QTime(23, 59, 59)));
+        defaultManager.items(QDate(2010, 1, 1).startOfDay(),
+                             QDate(2010, 1, 31).endOfDay());
     //! [Retrieving entries for a time period]
 
     //! [Retrieving entries with a filter]
diff --git a/src/versitorganizer/qversitorganizerimporter_p.cpp b/src/versitorganizer/qversitorganizerimporter_p.cpp
index 7ca9242f9..9379dc8cf 100644
--- a/src/versitorganizer/qversitorganizerimporter_p.cpp
+++ b/src/versitorganizer/qversitorganizerimporter_p.cpp
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2017 The Qt Company Ltd.
+** Copyright (C) 2020 The Qt Company Ltd.
 ** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtVersitOrganizer module of the Qt Toolkit.
@@ -525,7 +525,7 @@ bool QVersitOrganizerImporterPrivate::createStartDateTime(
         QDateTime end = etr.endDateTime();
         if (!start.isValid()) {
             // not having a start date set is treated as a start date of epoch
-            start = QDateTime(QDate(1970, 1, 1));
+            start = QDate(1970, 1, 1).startOfDay();
         }
         // newEnd = end + (newStart - start)
         int durationDays = start.daysTo(newStart);
@@ -584,7 +584,7 @@ bool QVersitOrganizerImporterPrivate::createDuration(
     QDateTime startTime = etr.startDateTime();
     if (!startTime.isValid()) {
         // not having a start date set is treated as a start date of epoch
-        startTime = QDateTime(QDate(1970, 1, 1));
+        startTime = QDate(1970, 1, 1).startOfDay();
     }
     etr.setEndDateTime(
             startTime.addDays(7*duration.weeks() + duration.days())
diff --git a/tests/auto/contacts/qcontactdetails/tst_qcontactdetails.cpp b/tests/auto/contacts/qcontactdetails/tst_qcontactdetails.cpp
index a74fa7d33..65197506a 100644
--- a/tests/auto/contacts/qcontactdetails/tst_qcontactdetails.cpp
+++ b/tests/auto/contacts/qcontactdetails/tst_qcontactdetails.cpp
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2017 The Qt Company Ltd.
+** Copyright (C) 2020 The Qt Company Ltd.
 ** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the test suite of the Qt Toolkit.
@@ -212,7 +212,7 @@ void tst_QContactDetails::anniversary()
     QContactAnniversary a1, a2;
     QDateTime currDateTime = QDateTime::currentDateTime();
     QDate currDate = currDateTime.date();
-    QDateTime snippedDateTime = QDateTime(currDate);
+    QDateTime snippedDateTime = currDate.startOfDay();
 
     // test property set
     a1.setCalendarId("1234");
@@ -308,7 +308,7 @@ void tst_QContactDetails::birthday()
     QContactBirthday b1, b2, b3;
     QDateTime currDateTime = QDateTime::currentDateTime();
     QDate currDate = currDateTime.date();
-    QDateTime snippedDateTime = QDateTime(currDate);
+    QDateTime snippedDateTime = currDate.startOfDay();
 
     // test property set
     b1.setDate(currDate);
diff --git a/tests/auto/contacts/qcontactmanagerdetails/tst_qcontactmanagerdetails.cpp b/tests/auto/contacts/qcontactmanagerdetails/tst_qcontactmanagerdetails.cpp
index 2633d4b01..fa930e766 100644
--- a/tests/auto/contacts/qcontactmanagerdetails/tst_qcontactmanagerdetails.cpp
+++ b/tests/auto/contacts/qcontactmanagerdetails/tst_qcontactmanagerdetails.cpp
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2017 The Qt Company Ltd.
+** Copyright (C) 2020 The Qt Company Ltd.
 ** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the test suite of the Qt Toolkit.
@@ -280,7 +280,7 @@ void tst_QContactManagerDetails::testBirthday()
     QContact c;
 
     QContactBirthday b;
-    b.setDateTime( QDateTime(QDate(2001,1,1)) );
+    b.setDateTime(QDate(2001, 1, 1).startOfDay());
     c.saveDetail( &b );
 
     saveAndVerifyContact( cm.data(), c );
diff --git a/tests/auto/organizer/qorganizeritem/tst_qorganizeritem.cpp b/tests/auto/organizer/qorganizeritem/tst_qorganizeritem.cpp
index 738fa138c..24670a82e 100644
--- a/tests/auto/organizer/qorganizeritem/tst_qorganizeritem.cpp
+++ b/tests/auto/organizer/qorganizeritem/tst_qorganizeritem.cpp
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2017 The Qt Company Ltd.
+** Copyright (C) 2020 The Qt Company Ltd.
 ** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the test suite of the Qt Toolkit.
@@ -931,10 +931,10 @@ void tst_QOrganizerItem::event()
     testEvent.setLocation("test address");
     QCOMPARE(testEvent.location(), QString("test address"));
 
-    testEvent.setStartDateTime(QDateTime(QDate::currentDate()));
-    QCOMPARE(testEvent.startDateTime(), QDateTime(QDate::currentDate()));
-    testEvent.setEndDateTime(QDateTime(QDate::currentDate().addDays(1)));
-    QCOMPARE(testEvent.endDateTime(), QDateTime(QDate::currentDate().addDays(1)));
+    testEvent.setStartDateTime(QDate::currentDate().startOfDay());
+    QCOMPARE(testEvent.startDateTime(), QDate::currentDate().startOfDay());
+    testEvent.setEndDateTime(QDate::currentDate().addDays(1).startOfDay());
+    QCOMPARE(testEvent.endDateTime(), QDate::currentDate().addDays(1).startOfDay());
     QVERIFY(!testEvent.isAllDay()); // default to not all day
     testEvent.setAllDay(true);
     QVERIFY(testEvent.isAllDay());
@@ -1043,10 +1043,10 @@ void tst_QOrganizerItem::todo()
     QDateTime currentDateTime = QDateTime::currentDateTime();
     testTodo.setStartDateTime(currentDateTime);
     QCOMPARE(testTodo.startDateTime(), currentDateTime);
-    testTodo.setDueDateTime(QDateTime(QDate::currentDate()));
-    QCOMPARE(testTodo.dueDateTime(), QDateTime(QDate::currentDate()));
-    testTodo.setFinishedDateTime(QDateTime(QDate::currentDate().addDays(1)));
-    QCOMPARE(testTodo.finishedDateTime(), QDateTime(QDate::currentDate().addDays(1)));
+    testTodo.setDueDateTime(QDate::currentDate().startOfDay());
+    QCOMPARE(testTodo.dueDateTime(), QDate::currentDate().startOfDay());
+    testTodo.setFinishedDateTime(QDate::currentDate().addDays(1).startOfDay());
+    QCOMPARE(testTodo.finishedDateTime(), QDate::currentDate().addDays(1).startOfDay());
 
     QVERIFY(testTodo.isAllDay() == false); // default should not be all day event.
     testTodo.setAllDay(true);
@@ -1118,10 +1118,10 @@ void tst_QOrganizerItem::eventOccurrence()
     testEventOccurrence.setLocation("test address");
     QCOMPARE(testEventOccurrence.location(), QString("test address"));
 
-    testEventOccurrence.setStartDateTime(QDateTime(QDate::currentDate()));
-    QCOMPARE(testEventOccurrence.startDateTime(), QDateTime(QDate::currentDate()));
-    testEventOccurrence.setEndDateTime(QDateTime(QDate::currentDate().addDays(1)));
-    QCOMPARE(testEventOccurrence.endDateTime(), QDateTime(QDate::currentDate().addDays(1)));
+    testEventOccurrence.setStartDateTime(QDate::currentDate().startOfDay());
+    QCOMPARE(testEventOccurrence.startDateTime(), QDate::currentDate().startOfDay());
+    testEventOccurrence.setEndDateTime(QDate::currentDate().addDays(1).startOfDay());
+    QCOMPARE(testEventOccurrence.endDateTime(), QDate::currentDate().addDays(1).startOfDay());
 
     testEventOccurrence.setPriority(QOrganizerItemPriority::VeryHighPriority);
     QCOMPARE(testEventOccurrence.priority(), QOrganizerItemPriority::VeryHighPriority);
@@ -1153,12 +1153,12 @@ void tst_QOrganizerItem::todoOccurrence()
     testTodoOccurrence.setStatus(QOrganizerTodoProgress::StatusComplete);
     QCOMPARE(testTodoOccurrence.progressPercentage(), 50); // XXX TODO: should this update automatically?
 
-    testTodoOccurrence.setStartDateTime(QDateTime(QDate::currentDate()));
-    QCOMPARE(testTodoOccurrence.startDateTime(), QDateTime(QDate::currentDate()));
-    testTodoOccurrence.setDueDateTime(QDateTime(QDate::currentDate()));
-    QCOMPARE(testTodoOccurrence.dueDateTime(), QDateTime(QDate::currentDate()));
-    testTodoOccurrence.setFinishedDateTime(QDateTime(QDate::currentDate().addDays(1)));
-    QCOMPARE(testTodoOccurrence.finishedDateTime(), QDateTime(QDate::currentDate().addDays(1)));
+    testTodoOccurrence.setStartDateTime(QDate::currentDate()te::currentDate().addDays(1).startOfDay());
+    QCOMPARE(testTodoOccurrence.startDateTime(), QDate::currentDate().startOfDay());
+    testTodoOccurrence.setDueDateTime(QDate::currentDate().startOfDay());
+    QCOMPARE(testTodoOccurrence.dueDateTime(), QDate::currentDate().startOfDay());
+    testTodoOccurrence.setFinishedDateTime(QDate::currentDate().addDays(1).startOfDay());
+    QCOMPARE(testTodoOccurrence.finishedDateTime(), QDate::currentDate().addDays(1).startOfDay());
 
     testTodoOccurrence.setPriority(QOrganizerItemPriority::VeryHighPriority);
     QCOMPARE(testTodoOccurrence.priority(), QOrganizerItemPriority::VeryHighPriority);
@@ -1242,8 +1242,8 @@ void tst_QOrganizerItem::itemsCompare()
     a2.setEmailAddress("people3@qt-project.org");
 
     QOrganizerEventTime etr;
-    etr.setStartDateTime(QDateTime(QDate::currentDate()));
-    etr.setEndDateTime(QDateTime(QDate::currentDate().addDays(1)));
+    etr.setStartDateTime(QDate::currentDate().startOfDay());
+    etr.setEndDateTime(QDate::currentDate().addDays(1).startOfDay());
 
     QOrganizerItem item1;
     QOrganizerItem item2;
diff --git a/tests/auto/organizer/qorganizeritemdetails/tst_qorganizeritemdetails.cpp b/tests/auto/organizer/qorganizeritemdetails/tst_qorganizeritemdetails.cpp
index d785ac34e..246c9af2b 100644
--- a/tests/auto/organizer/qorganizeritemdetails/tst_qorganizeritemdetails.cpp
+++ b/tests/auto/organizer/qorganizeritemdetails/tst_qorganizeritemdetails.cpp
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2017 The Qt Company Ltd.
+** Copyright (C) 2020 The Qt Company Ltd.
 ** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the test suite of the Qt Toolkit.
@@ -505,8 +505,8 @@ void tst_QOrganizerItemDetails::todoProgress()
     p.setPercentageComplete(200); // this should fail
     QVERIFY(p.percentageComplete() == 50); // value should remain unchanged.
 
-    p.setFinishedDateTime(QDateTime(QDate(2010, 10, 13)));
-    QVERIFY(p.finishedDateTime() == QDateTime(QDate(2010, 10, 13)));
+    p.setFinishedDateTime(QDate(2010, 10, 13).startOfDay());
+    QVERIFY(p.finishedDateTime() == QDate(2010, 10, 13).startOfDay());
     QVERIFY(p.status() != QOrganizerTodoProgress::StatusComplete); // XXX TODO: should this be automatic?
     p.setPercentageComplete(100);
     QVERIFY(p.percentageComplete() == 100);
@@ -584,19 +584,19 @@ void tst_QOrganizerItemDetails::eventTime()
     QVERIFY(r.isEmpty());
     QVERIFY(!r.isAllDay());
 
-    r.setStartDateTime(QDateTime(QDate(2010, 10, 13)));
-    QVERIFY(r.startDateTime() == QDateTime(QDate(2010, 10, 13)));
+    r.setStartDateTime(QDate(2010, 10, 13).startOfDay());
+    QVERIFY(r.startDateTime() == QDate(2010, 10, 13).startOfDay());
     QVERIFY(!r.isAllDay());
     r.setAllDay(true);
     QVERIFY(r.isAllDay());
 
-    r.setEndDateTime(QDateTime(QDate(2010, 10, 14)));
-    QVERIFY(r.endDateTime() == QDateTime(QDate(2010, 10, 14)));
+    r.setEndDateTime(QDate(2010, 10, 14).startOfDay());
+    QVERIFY(r.endDateTime() == QDate(2010, 10, 14).startOfDay());
 
     // add
     QOrganizerEventTime r2;
-    r2.setStartDateTime(QDateTime(QDate(2010, 10, 23)));
-    r2.setEndDateTime(QDateTime(QDate(2010, 10, 24)));
+    r2.setStartDateTime(QDate(2010, 10, 23).startOfDay());
+    r2.setEndDateTime(QDate(2010, 10, 24).startOfDay());
     QVERIFY(e.saveDetail(&r));
     QVERIFY(e.details(QOrganizerItemDetail::TypeEventTime).size() == 1);
     QVERIFY(e.detail(QOrganizerItemDetail::TypeEventTime) == r);
@@ -624,12 +624,12 @@ void tst_QOrganizerItemDetails::journalTime()
     QOrganizerJournal j;
 
     QVERIFY(r.isEmpty());
-    r.setEntryDateTime(QDateTime(QDate(2010, 10, 13)));
-    QVERIFY(r.entryDateTime() == QDateTime(QDate(2010, 10, 13)));
+    r.setEntryDateTime(QDate(2010, 10, 13).startOfDay());
+    QVERIFY(r.entryDateTime() == QDate(2010, 10, 13).startOfDay());
 
     // add
     QOrganizerJournalTime r2;
-    r2.setEntryDateTime(QDateTime(QDate(2010, 10, 23)));
+    r2.setEntryDateTime(QDate(2010, 10, 23).startOfDay());
     QVERIFY(j.saveDetail(&r));
     QVERIFY(j.details(QOrganizerItemDetail::TypeJournalTime).size() == 1);
     QVERIFY(j.detail(QOrganizerItemDetail::TypeJournalTime) == r);
@@ -640,7 +640,7 @@ void tst_QOrganizerItemDetails::journalTime()
     QVERIFY(j.detail(QOrganizerItemDetail::TypeJournalTime) == r);
 
     // update
-    r.setEntryDateTime(QDateTime(QDate(2010, 11, 05)));
+    r.setEntryDateTime(QDate(2010, 11, 05).startOfDay());
     QVERIFY(j.detail(QOrganizerItemDetail::TypeJournalTime) != r);
     QVERIFY(j.saveDetail(&r));
     QVERIFY(j.detail(QOrganizerItemDetail::TypeJournalTime) == r);
@@ -659,19 +659,19 @@ void tst_QOrganizerItemDetails::todoTime()
     QVERIFY(r.isEmpty());
     QVERIFY(!r.isAllDay());
 
-    r.setStartDateTime(QDateTime(QDate(2010, 10, 13)));
-    QVERIFY(r.startDateTime() == QDateTime(QDate(2010, 10, 13)));
+    r.setStartDateTime(QDate(2010, 10, 13).startOfDay());
+    QVERIFY(r.startDateTime() == QDate(2010, 10, 13).startOfDay());
     QVERIFY(!r.isAllDay());
     r.setAllDay(true);
     QVERIFY(r.isAllDay());
 
-    r.setDueDateTime(QDateTime(QDate(2010, 10, 14)));
-    QVERIFY(r.dueDateTime() == QDateTime(QDate(2010, 10, 14)));
+    r.setDueDateTime(QDate(2010, 10, 14).startOfDay());
+    QVERIFY(r.dueDateTime() == QDate(2010, 10, 14).startOfDay());
 
     // add
     QOrganizerTodoTime r2;
-    r2.setStartDateTime(QDateTime(QDate(2010, 10, 23)));
-    r2.setDueDateTime(QDateTime(QDate(2010, 10, 24)));
+    r2.setStartDateTime(QDate(2010, 10, 23).startOfDay());
+    r2.setDueDateTime(QDate(2010, 10, 24).startOfDay());
     QVERIFY(t.saveDetail(&r));
     QVERIFY(t.details(QOrganizerItemDetail::TypeTodoTime).size() == 1);
     QVERIFY(t.detail(QOrganizerItemDetail::TypeTodoTime) == r);
diff --git a/tests/auto/organizer/qorganizermanager/tst_qorganizermanager.cpp b/tests/auto/organizer/qorganizermanager/tst_qorganizermanager.cpp
index ebf843f69..0e0f03f94 100644
--- a/tests/auto/organizer/qorganizermanager/tst_qorganizermanager.cpp
+++ b/tests/auto/organizer/qorganizermanager/tst_qorganizermanager.cpp
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2017 The Qt Company Ltd.
+** Copyright (C) 2020 The Qt Company Ltd.
 ** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the test suite of the Qt Toolkit.
@@ -910,8 +910,8 @@ void tst_QOrganizerManager::addExceptions()
     QVERIFY(!event.guid().isEmpty());
 
     QList<QOrganizerItem> items =
-        cm->itemOccurrences(event, QDateTime(QDate(2010, 1, 1), QTime(0, 0, 0)),
-                                 QDateTime(QDate(2010, 2, 1), QTime(0, 0, 0)));
+        cm->itemOccurrences(event, QDate(2010, 1, 1).startOfDay(),
+                                   QDate(2010, 2, 1).startOfDay());
     QCOMPARE(items.size(), 3);
     QOrganizerItem secondItem = items.at(1);
     QCOMPARE(secondItem.type(), QOrganizerItemType::TypeEventOccurrence);
@@ -924,8 +924,8 @@ void tst_QOrganizerManager::addExceptions()
     secondEvent.setDisplayLabel(QStringLiteral("seminar"));
     QVERIFY(cm->saveItem(&secondEvent));
     event = cm->item(event.id()); // reload the event to pick up any changed exception dates.
-    items = cm->itemOccurrences(event, QDateTime(QDate(2010, 1, 1), QTime(0, 0, 0)),
-                                     QDateTime(QDate(2010, 2, 1), QTime(0, 0, 0)));
+    items = cm->itemOccurrences(event, QDate(2010, 1, 1).startOfDay(),
+                                       QDate(2010, 2, 1).startOfDay());
     QCOMPARE(items.size(), 3); // shouldn't change the count.
 
     // save a change to an occurrence's time
@@ -936,8 +936,8 @@ void tst_QOrganizerManager::addExceptions()
     thirdEvent.setEndDateTime(QDateTime(QDate(2010, 1, 15), QTime(14, 0, 0)));
     QVERIFY(cm->saveItem(&thirdEvent));
     event = cm->item(event.id()); // reload the event to pick up any changed exception dates.
-    items = cm->itemOccurrences(event, QDateTime(QDate(2010, 1, 1), QTime(0, 0, 0)),
-                                     QDateTime(QDate(2010, 2, 1), QTime(0, 0, 0)));
+    items = cm->itemOccurrences(event, QDate(2010, 1, 1).startOfDay(),
+                                       QDate(2010, 2, 1).startOfDay());
     QCOMPARE(items.size(), 3); // shouldn't change the count.
 
     QOrganizerItem firstItem;
@@ -981,8 +981,8 @@ void tst_QOrganizerManager::addExceptions()
     // remove persisted exception, it should not modify parent item's exception dates
     cm->removeItem(secondEvent.id());
     event = cm->item(event.id()); // reload the event to pick up any changed exception dates.
-    items = cm->itemOccurrences(event, QDateTime(QDate(2010, 1, 1), QTime(0, 0, 0)),
-                                     QDateTime(QDate(2010, 2, 1), QTime(0, 0, 0)));
+    items = cm->itemOccurrences(event, QDate(2010, 1, 1).startOfDay(),
+                                       QDate(2010, 2, 1).startOfDay());
     QCOMPARE(items.size(), 2); // shouldn't change the count.
 
     // remove the parent item, persisted exceptions should be removed also
@@ -1175,8 +1175,8 @@ void tst_QOrganizerManager::addExceptionsWithGuid()
     // Set up some recurring items
     QOrganizerEvent christmas;
     christmas.setGuid("christmas");
-    christmas.setStartDateTime(QDateTime(QDate(2009, 12, 25), QTime(0, 0, 0)));
-    christmas.setEndDateTime(QDateTime(QDate(2009, 12, 26), QTime(0, 0, 0)));
+    christmas.setStartDateTime(QDate(2009, 12, 25).startOfDay());
+    christmas.setEndDateTime(QDate(2009, 12, 26).startOfDay());
     christmas.setDisplayLabel(QStringLiteral("Christmas"));
     QOrganizerRecurrenceRule rrule;
     rrule.setFrequency(QOrganizerRecurrenceRule::Yearly);
@@ -1187,15 +1187,15 @@ void tst_QOrganizerManager::addExceptionsWithGuid()
 
     QOrganizerEvent newYearsDay;
     newYearsDay.setGuid("newyear");
-    newYearsDay.setStartDateTime(QDateTime(QDate(2010, 1, 1), QTime(0, 0, 0)));
-    newYearsDay.setEndDateTime(QDateTime(QDate(2010, 1, 2), QTime(0, 0, 0)));
+    newYearsDay.setStartDateTime(QDate(2010, 1, 1).startOfDay());
+    newYearsDay.setEndDateTime(QDate(2010, 1, 2).startOfDay());
     newYearsDay.setDisplayLabel(QStringLiteral("New Years Day"));
     newYearsDay.setRecurrenceRule(rrule);
     QVERIFY(cm->saveItem(&newYearsDay));
 
     QOrganizerTodo report;
     report.setGuid("report");
-    report.setDueDateTime(QDateTime(QDate(2010, 1, 11), QTime(0, 0, 0)));
+    report.setDueDateTime(QDate(2010, 1, 11).startOfDay());
     report.setDisplayLabel(QStringLiteral("Report"));
     QVERIFY(cm->saveItem(&report));
 
@@ -1203,8 +1203,8 @@ void tst_QOrganizerManager::addExceptionsWithGuid()
     // exception with no guid or parentId fails
     QOrganizerEventOccurrence exception;
     exception.setOriginalDate(QDate(2010, 12, 25));
-    exception.setStartDateTime(QDateTime(QDate(2010, 12, 25), QTime(0, 0, 0)));
-    exception.setEndDateTime(QDateTime(QDate(2010, 12, 26), QTime(0, 0, 0)));
+    exception.setStartDateTime(QDate(2010, 12, 25).startOfDay());
+    exception.setEndDateTime(QDate(2010, 12, 26).startOfDay());
     exception.setDisplayLabel(QStringLiteral("Xmas"));
 //    if (cm->detailDefinitions(QOrganizerItemType::TypeEventOccurrence).contains(QOrganizerItemComment::DefinitionName))
 //        exception.addComment(QLatin1String("With the in-laws"));
@@ -1235,8 +1235,8 @@ void tst_QOrganizerManager::addExceptionsWithGuid()
     // can't set parentId to a non-event
     QOrganizerEventOccurrence exception2;
     exception2.setOriginalDate(QDate(2011, 12, 25));
-    exception2.setStartDateTime(QDateTime(QDate(2011, 12, 25), QTime(0, 0, 0)));
-    exception2.setEndDateTime(QDateTime(QDate(2011, 12, 26), QTime(0, 0, 0)));
+    exception2.setStartDateTime(QDate(2011, 12, 25).startOfDay());
+    exception2.setEndDateTime(QDate(2011, 12, 26).startOfDay());
     exception2.setDisplayLabel(QStringLiteral("XMas"));
 //    if (cm->detailDefinitions(QOrganizerItemType::TypeEventOccurrence).contains(QOrganizerItemComment::DefinitionName))
 //        exception2.addComment(QLatin1String("With the in-laws"));
@@ -1266,8 +1266,8 @@ void tst_QOrganizerManager::addExceptionsWithGuid()
     // Make a fresh exception object on a fresh date to avoid clashing with the previously saved one
     // exception without originalDate fails
     QOrganizerEventOccurrence exception3;
-    exception3.setStartDateTime(QDateTime(QDate(2012, 12, 25), QTime(0, 0, 0)));
-    exception3.setEndDateTime(QDateTime(QDate(2012, 12, 26), QTime(0, 0, 0)));
+    exception3.setStartDateTime(QDate(2012, 12, 25).startOfDay());
+    exception3.setEndDateTime(QDate(2012, 12, 26).startOfDay());
     exception3.setDisplayLabel(QStringLiteral("XMas"));
 //    if (cm->detailDefinitions(QOrganizerItemType::TypeEventOccurrence).contains(QOrganizerItemComment::DefinitionName))
 //        exception3.addComment(QLatin1String("With the in-laws"));
@@ -2887,11 +2887,11 @@ void tst_QOrganizerManager::testFilterFunction()
     // Test for QOrganizerItemFilter::OrganizerItemDetailRangeFilter:
     QOrganizerItemDetailRangeFilter fdrf;
     fdrf.setDetail(QOrganizerItemDetail::TypeEventTime, QOrganizerEventTime::FieldStartDateTime);
-    fdrf.setRange(QDateTime(QDate(2010,10,9)), QDateTime(QDate(2010,10,11)));
+    fdrf.setRange(QDate(2010,10,9).startOfDay(), QDate(2010,10,11).startOfDay());
     // test for a valid range
     QVERIFY(QOrganizerManagerEngine::testFilter(fdrf, item));
 
-    fdrf.setRange(QDateTime(QDate(2010,10,11)), QDateTime(QDate(2010,10,12)));
+    fdrf.setRange(QDate(2010,10,11).startOfDay(), QDate(2010,10,12).startOfDay());
     // test for item not in the range
     QVERIFY(!QOrganizerManagerEngine::testFilter(fdrf, item));
 
@@ -3094,11 +3094,11 @@ void tst_QOrganizerManager::itemFetch()
     QVERIFY(cm->saveItem(&recEvent));
 
     //fetch all recurrences
-    QList<QOrganizerItem> items = cm->items(QDateTime(QDate(2010, 9, 8)), QDateTime(QDate(2010, 9, 12)));
+    QList<QOrganizerItem> items = cm->items(QDate(2010, 9, 8).startOfDay(), QDate(2010, 9, 12).startOfDay());
     QCOMPARE(items.count(), 4); // should return event + 3 x occurrencesOfRecEvent
 
     //fetch only the originating items
-    items = cm->itemsForExport(QDateTime(QDate(2010, 9, 8)), QDateTime(QDate(2010, 9, 12)),
+    items = cm->itemsForExport(QDate(2010, 9, 8).startOfDay(), QDate(2010, 9, 12).startOfDay(),
                                QOrganizerItemFilter(), QList<QOrganizerItemSortOrder>(), QOrganizerItemFetchHint());
     QCOMPARE(items.count(), 2);
 
@@ -3219,8 +3219,8 @@ void tst_QOrganizerManager::itemFetch()
     QCOMPARE(eventOccurrenceCount, 3);
 
     // fourth, all occurrences persisted, time period excludes parent item, but it's still fetched
-    items = cm->itemsForExport(QDateTime(QDate(2010, 9, 2)),
-                               QDateTime(QDate(2010, 9, 4)));
+    items = cm->itemsForExport(QDate(2010, 9, 2).startOfDay(),
+                               QDate(2010, 9, 4).startOfDay());
     QCOMPARE(items.size(), 3); // parent + 2 persisted exceptions
     eventCount = 0;
     eventOccurrenceCount = 0;
@@ -3313,11 +3313,11 @@ void tst_QOrganizerManager::todoItemFetch()
     QVERIFY(cm->saveItem(&recTodo));
 
     //fetch all recurrences
-    items = cm->items(QDateTime(QDate(2010, 9, 8)), QDateTime(QDate(2010, 9, 12)));
+    items = cm->items(QDate(2010, 9, 8).startOfDay(), QDate(2010, 9, 12).startOfDay());
     QCOMPARE(items.count(), 4); // should return todo + 3 x occurrencesOfRecTodo
 
     //fetch only the originating items
-    items = cm->itemsForExport(QDateTime(QDate(2010, 9, 8)), QDateTime(QDate(2010, 9, 12)),
+    items = cm->itemsForExport(QDate(2010, 9, 8).startOfDay(), QDate(2010, 9, 12).startOfDay(),
                                QOrganizerItemFilter(), QList<QOrganizerItemSortOrder>(), QOrganizerItemFetchHint());
     QCOMPARE(items.count(), 2);
 
@@ -3458,7 +3458,7 @@ void tst_QOrganizerManager::itemFetchV2()
     QVERIFY(cm->saveItem(&event2));
 
     // Get items without a maxCount, check that they're date sorted
-    QList<QOrganizerItem> items = cm->items(QDateTime(QDate(2010, 1, 1), QTime(0, 0, 0)), QDateTime());
+    QList<QOrganizerItem> items = cm->items(QDate(2010, 1, 1).startOfDay(), QDateTime());
     QCOMPARE(items.size(), 4);
     QCOMPARE(items[0].displayLabel(), QStringLiteral("event1"));
     QCOMPARE(items[1].displayLabel(), QStringLiteral("event2"));
@@ -3466,7 +3466,7 @@ void tst_QOrganizerManager::itemFetchV2()
     QCOMPARE(items[3].displayLabel(), QStringLiteral("event2"));
 
     // Get the next 3 items from 2010-02-01
-    items = cm->items(QDateTime(QDate(2010, 1, 1), QTime(0, 0, 0)),
+    items = cm->items(QDate(2010, 1, 1).startOfDay(),
                       QDateTime(),  // no end date limit
                       QOrganizerItemFilter(),
                       3);           // maxCount
@@ -3490,36 +3490,36 @@ void tst_QOrganizerManager::spanOverDays()
     QVERIFY(cm->saveItem(&event));
 
     // just fetch one day from the event
-    QList<QOrganizerItem> items = cm->items(QDateTime(QDate(2010, 8, 9)),
-                                            QDateTime(QDate(2010, 8, 9), QTime(23,59,59)));
+    QList<QOrganizerItem> items = cm->items(QDate(2010, 8, 9).startOfDay(),
+                                            QDate(2010, 8, 9).endOfDay());
     QCOMPARE(items.count(), 1);
 
     // fetch the next day
-    items = cm->items(QDateTime(QDate(2010, 8, 10), QTime(0,0,0)), QDateTime(QDate(2010, 8, 10), QTime(23,59,59)));
+    items = cm->items(QDate(2010, 8, 10).startOfDay(), QDate(2010, 8, 10).endOfDay());
     QCOMPARE(items.count(), 1);
 
     // fetch the last day
-    items = cm->items(QDateTime(QDate(2010, 8, 11), QTime(0,0,0)), QDateTime(QDate(2010, 11, 10), QTime(23,59,59)));
+    items = cm->items(QDate(2010, 8, 11).startOfDay(), QDate(2010, 11, 10).endOfDay());
     QCOMPARE(items.count(), 1);
 
     // fetch an interval starting before the event until infinity
-    items = cm->items(QDateTime(QDate(2010, 8, 5), QTime(0,0,0)), QDateTime());
+    items = cm->items(QDate(2010, 8, 5).startOfDay(), QDateTime());
     QCOMPARE(items.count(), 1);
 
     // fetch an interval ending after the event
-    items = cm->items(QDateTime(), QDateTime(QDate(2010, 12, 10), QTime(23,59,59)));
+    items = cm->items(QDateTime(), QDate(2010, 12, 10).endOfDay());
     QCOMPARE(items.count(), 1);
 
     // fetch an interval starting before the event and ending at almost end of the year
-    items = cm->items(QDateTime(QDate(2010, 8, 5), QTime(0,0,0)), QDateTime(QDate(2010, 12, 10), QTime(23,59,59)));
+    items = cm->items(QDate(2010, 8, 5).startOfDay(), QDate(2010, 12, 10).endOfDay());
     QCOMPARE(items.count(), 1);
 
     // fetch an interval ending in the middle of the event
-    items = cm->items(QDateTime(), QDateTime(QDate(2010, 8, 10), QTime(23,59,59)));
+    items = cm->items(QDateTime(), QDate(2010, 8, 10).endOfDay());
     QCOMPARE(items.count(), 1);
 
     // fetch an interval starting from the middle of the event until infinity
-    items = cm->items(QDateTime(QDate(2010, 8, 10), QTime(0,0,0)), QDateTime());
+    items = cm->items(QDate(2010, 8, 10).startOfDay(), QDateTime());
     QCOMPARE(items.count(), 1);
 
     cm->removeItems(cm->itemIds()); // empty the calendar to prevent the previous test from interfering this one
@@ -3534,7 +3534,7 @@ void tst_QOrganizerManager::spanOverDays()
     event2.setRecurrenceRule(rrule);
     QVERIFY(cm->saveItem(&event2));
 
-    items = cm->items(QDateTime(QDate(2010, 8, 8)), QDateTime(QDate(2010, 9, 3)));
+    items = cm->items(QDate(2010, 8, 8).startOfDay(), QDate(2010, 9, 3).startOfDay());
     QCOMPARE(items.count(), 4);
     QCOMPARE(static_cast<QOrganizerEventOccurrence>(items[0]).startDateTime(), QDateTime(QDate(2010, 8, 9), QTime(11, 0, 0)));
     QCOMPARE(static_cast<QOrganizerEventOccurrence>(items[0]).endDateTime(), QDateTime(QDate(2010, 8, 11), QTime(11, 30, 0)));
@@ -3556,7 +3556,7 @@ void tst_QOrganizerManager::spanOverDays()
     todo.setRecurrenceRule(rrule2);
     QVERIFY(cm->saveItem(&todo));
 
-    items = cm->items(QDateTime(QDate(2010, 8, 8)), QDateTime(QDate(2010, 9, 3)));
+    items = cm->items(QDate(2010, 8, 8).startOfDay(), QDate(2010, 9, 3).startOfDay());
     QCOMPARE(items.count(), 4);
     QCOMPARE(static_cast<QOrganizerTodoOccurrence>(items[0]).startDateTime(), QDateTime(QDate(2010, 8, 9), QTime(11, 0, 0)));
     QCOMPARE(static_cast<QOrganizerTodoOccurrence>(items[0]).dueDateTime(), QDateTime(QDate(2010, 8, 11), QTime(11, 30, 0)));
@@ -3583,7 +3583,7 @@ void tst_QOrganizerManager::incompleteTodoTime()
     todo.setRecurrenceRule(rrule);
     QVERIFY(cm->saveItem(&todo));
 
-    QList<QOrganizerItem> items = cm->items(QDateTime(QDate(2010, 8, 8)), QDateTime(QDate(2010, 9, 3)));
+    QList<QOrganizerItem> items = cm->items(QDate(2010, 8, 8).startOfDay(), QDate(2010, 9, 3).startOfDay());
     QCOMPARE(items.count(), 4);
     QCOMPARE(static_cast<QOrganizerTodoOccurrence>(items[0]).dueDateTime(), QDateTime(QDate(2010, 8, 11), QTime(11, 30, 0)));
     QCOMPARE(static_cast<QOrganizerTodoOccurrence>(items[1]).dueDateTime(), QDateTime(QDate(2010, 8, 12), QTime(11, 30, 0)));
@@ -3601,7 +3601,7 @@ void tst_QOrganizerManager::incompleteTodoTime()
     todo2.setRecurrenceRule(rrule2);
     QVERIFY(cm->saveItem(&todo2));
 
-    items = cm->items(QDateTime(QDate(2010, 8, 8)), QDateTime(QDate(2010, 9, 3)));
+    items = cm->items(QDate(2010, 8, 8).startOfDay(), QDate(2010, 9, 3).startOfDay());
     QCOMPARE(items.count(), 3);
     QCOMPARE(static_cast<QOrganizerTodoOccurrence>(items[0]).dueDateTime(), QDateTime(QDate(2010, 8, 11), QTime(11, 30, 0)));
     QCOMPARE(static_cast<QOrganizerTodoOccurrence>(items[1]).dueDateTime(), QDateTime(QDate(2010, 8, 12), QTime(11, 30, 0)));
@@ -3614,7 +3614,7 @@ void tst_QOrganizerManager::incompleteTodoTime()
     QVERIFY(cm->saveItem(&todo3));
     items = cm->items();
     QCOMPARE(items.count(), 0);
-    items = cm->items(QDateTime(QDate(2010, 8, 8)), QDateTime(QDate(2010, 9, 3)));
+    items = cm->items(QDate(2010, 8, 8).startOfDay(), QDate(2010, 9, 3).startOfDay());
     QCOMPARE(items.count(), 6);
 
     QCOMPARE(static_cast<QOrganizerTodoOccurrence>(items[0]).originalDate(), QDate(2010, 8, 8));
@@ -3645,16 +3645,16 @@ void tst_QOrganizerManager::recurrence()
 
     {
         // Fetch all events with occurrences
-        QList<QOrganizerItem> items = cm->items(QDateTime(QDate(2012, 8, 9)),
-                                                QDateTime(QDate(2012, 8, 12), QTime(23,59,59)));
+        QList<QOrganizerItem> items = cm->items(QDate(2012, 8, 9).startOfDay(),
+                                                QDate(2012, 8, 12).endOfDay());
         QCOMPARE(items.count(), 3);
 
         // Fetch events for the first day
-        items = cm->items(QDateTime(QDate(2012, 8, 9), QTime(0,0,0)), QDateTime(QDate(2012, 8, 9), QTime(23,59,59)));
+        items = cm->items(QDate(2012, 8, 9).startOfDay(), QDate(2012, 8, 9).endOfDay());
         QCOMPARE(items.count(), 1);
 
         // Fetch events for the second day
-        items = cm->items(QDateTime(QDate(2012, 8, 10), QTime(0,0,0)), QDateTime(QDate(2012, 8, 10), QTime(23,59,59)));
+        items = cm->items(QDate(2012, 8, 10).startOfDay(), QDate(2012, 8, 10).endOfDay());
         QCOMPARE(items.count(), 1);
 
         // Create an exception on the second day
@@ -3663,7 +3663,7 @@ void tst_QOrganizerManager::recurrence()
         QVERIFY(cm->saveItem(&ex));
 
         // Fetch again the events for the second day
-        items = cm->items(QDateTime(QDate(2012, 8, 10), QTime(0,0,0)), QDateTime(QDate(2012, 8, 10), QTime(23,59,59)));
+        items = cm->items(QDate(2012, 8, 10).startOfDay(), QDate(2012, 8, 10).endOfDay());
         QCOMPARE(items.count(), 1);
         QOrganizerItem item = items.at(0);
         QVERIFY(!item.id().isNull());
@@ -3677,7 +3677,7 @@ void tst_QOrganizerManager::recurrence()
         QVERIFY(cm->saveItem(&event2));
 
         // Fetch the whole period again
-        items = cm->items(QDateTime(QDate(2012, 8, 9)), QDateTime(QDate(2012, 8, 12), QTime(23,59,59)));
+        items = cm->items(QDate(2012, 8, 9).startOfDay(), QDate(2012, 8, 12).endOfDay());
         QCOMPARE(items.count(), 4);
         foreach(QOrganizerItem item, items) {
             // check if the item is the recurrence exception
@@ -3700,7 +3700,7 @@ void tst_QOrganizerManager::recurrence()
         }
 
         // Fetch events on a day where the recurrence is no longer valid
-        items = cm->items(QDateTime(QDate(2012, 8, 12), QTime(0,0,0)), QDateTime(QDate(2012, 8, 12), QTime(23,59,59)));
+        items = cm->items(QDate(2012, 8, 12).startOfDay(), QDate(2012, 8, 12).endOfDay());
         QCOMPARE(items.count(), 0);
     }
 
@@ -3717,8 +3717,8 @@ void tst_QOrganizerManager::recurrence()
     QVERIFY(cm->saveItem(&event));
     {
         // Fetch all events with occurrences
-        QList<QOrganizerItem> items = cm->items(QDateTime(QDate(2012, 8, 9)),
-                                                QDateTime(QDate(2013, 8, 12), QTime(23,59,59)));
+        QList<QOrganizerItem> items = cm->items(QDate(2012, 8, 9).startOfDay(),
+                                                QDate(2013, 8, 12).endOfDay());
         QVERIFY(items.count() > 1);
     }
     // second, test date limit.  The results should be the same as the count limit, if the limit date is the 11th.
@@ -3732,16 +3732,16 @@ void tst_QOrganizerManager::recurrence()
 
     {
         // Fetch all events with occurrences
-        QList<QOrganizerItem> items = cm->items(QDateTime(QDate(2012, 8, 9)),
-                                                QDateTime(QDate(2012, 8, 12), QTime(23,59,59)));
+        QList<QOrganizerItem> items = cm->items(QDate(2012, 8, 9).startOfDay(),
+                                                QDate(2012, 8, 12).endOfDay());
         QCOMPARE(items.count(), 3);
 
         // Fetch events for the first day
-        items = cm->items(QDateTime(QDate(2012, 8, 9), QTime(0,0,0)), QDateTime(QDate(2012, 8, 9), QTime(23,59,59)));
+        items = cm->items(QDate(2012, 8, 9).startOfDay(), QDate(2012, 8, 9).endOfDay());
         QCOMPARE(items.count(), 1);
 
         // Fetch events for the second day
-        items = cm->items(QDateTime(QDate(2012, 8, 10), QTime(0,0,0)), QDateTime(QDate(2012, 8, 10), QTime(23,59,59)));
+        items = cm->items(QDate(2012, 8, 10).startOfDay(), QDate(2012, 8, 10).endOfDay());
         QCOMPARE(items.count(), 1);
 
         // Create an exception on the second day
@@ -3750,7 +3750,7 @@ void tst_QOrganizerManager::recurrence()
         QVERIFY(cm->saveItem(&ex));
 
         // Fetch again the events for the second day
-        items = cm->items(QDateTime(QDate(2012, 8, 10), QTime(0,0,0)), QDateTime(QDate(2012, 8, 10), QTime(23,59,59)));
+        items = cm->items(QDate(2012, 8, 10).startOfDay(), QDate(2012, 8, 10).endOfDay());
         QCOMPARE(items.count(), 1);
         QOrganizerItem item = items.at(0);
         QVERIFY(!item.id().isNull());
@@ -3764,7 +3764,7 @@ void tst_QOrganizerManager::recurrence()
         QVERIFY(cm->saveItem(&event2));
 
         // Fetch the whole period again
-        items = cm->items(QDateTime(QDate(2012, 8, 9)), QDateTime(QDate(2012, 8, 12), QTime(23,59,59)));
+        items = cm->items(QDate(2012, 8, 9).startOfDay(), QDate(2012, 8, 12).endOfDay());
         QCOMPARE(items.count(), 4);
         foreach(QOrganizerItem item, items) {
             // check if the item is the recurrence exception
@@ -4083,52 +4083,52 @@ void tst_QOrganizerManager::dateRange_data()
     ev.setStartDateTime(QDateTime(QDate(2010, 10, 10), QTime(10,0,0)));
     ev.setEndDateTime(QDateTime(QDate(2010, 10, 12), QTime(11,0,0)));
 
-    QTest::newRow("event - month") << QOrganizerItem(ev) << QDateTime(QDate(2010,10,1)) << QDateTime(QDate(2010,10,31)) << true;
-    QTest::newRow("event - first day") << QOrganizerItem(ev) << QDateTime(QDate(2010,10,10)) << QDateTime(QDate(2010,10,10), QTime(23,59,59)) << true;
-    QTest::newRow("event - second day") << QOrganizerItem(ev) << QDateTime(QDate(2010,10,11)) << QDateTime(QDate(2010,10,11), QTime(23,59,59)) << true;
-    QTest::newRow("event - last day") << QOrganizerItem(ev) << QDateTime(QDate(2010,10,12)) << QDateTime(QDate(2010,10,12), QTime(23,59,59)) << true;
+    QTest::newRow("event - month") << QOrganizerItem(ev) << QDate(2010,10,1).startOfDay() << QDate(2010,10,31).startOfDay() << true;
+    QTest::newRow("event - first day") << QOrganizerItem(ev) << QDate(2010,10,10).startOfDay() << QDate(2010,10,10).endOfDay() << true;
+    QTest::newRow("event - second day") << QOrganizerItem(ev) << QDate(2010,10,11).startOfDay() << QDate(2010,10,11).endOfDay() << true;
+    QTest::newRow("event - last day") << QOrganizerItem(ev) << QDate(2010,10,12).startOfDay() << QDate(2010,10,12).endOfDay() << true;
     QTest::newRow("event - undefined period") << QOrganizerItem(ev) << QDateTime() << QDateTime() << true;
-    QTest::newRow("event - undefined start") << QOrganizerItem(ev) << QDateTime() << QDateTime(QDate(2010,10,11)) << true;
-    QTest::newRow("event - undefined end") << QOrganizerItem(ev) << QDateTime(QDate(2010,10,11)) << QDateTime() << true;
-    QTest::newRow("event - before") << QOrganizerItem(ev) << QDateTime(QDate(2010,10,8)) << QDateTime(QDate(2010,10,9)) << false;
-    QTest::newRow("event - after") << QOrganizerItem(ev) << QDateTime(QDate(2010,10,13)) << QDateTime(QDate(2010,10,14)) << false;
+    QTest::newRow("event - undefined start") << QOrganizerItem(ev) << QDateTime() << QDate(2010,10,11).startOfDay() << true;
+    QTest::newRow("event - undefined end") << QOrganizerItem(ev) << QDate(2010,10,11).startOfDay() << QDateTime() << true;
+    QTest::newRow("event - before") << QOrganizerItem(ev) << QDate(2010,10,8).startOfDay() << QDate(2010,10,9).startOfDay() << false;
+    QTest::newRow("event - after") << QOrganizerItem(ev) << QDate(2010,10,13).startOfDay() << QDate(2010,10,14).startOfDay() << false;
 
     QOrganizerTodo todo;
     todo.setStartDateTime(QDateTime(QDate(2010, 10, 10), QTime(10,0,0)));
     todo.setDueDateTime(QDateTime(QDate(2010, 10, 12), QTime(11,0,0)));
 
-    QTest::newRow("todo - month") << QOrganizerItem(todo) << QDateTime(QDate(2010,10,1)) << QDateTime(QDate(2010,10,31)) << true;
-    QTest::newRow("todo - first day") << QOrganizerItem(todo) << QDateTime(QDate(2010,10,10)) << QDateTime(QDate(2010,10,10), QTime(23,59,59)) << true;
-    QTest::newRow("todo - second day") << QOrganizerItem(todo) << QDateTime(QDate(2010,10,11)) << QDateTime(QDate(2010,10,11), QTime(23,59,59)) << true;
-    QTest::newRow("todo - last day") << QOrganizerItem(todo) << QDateTime(QDate(2010,10,12)) << QDateTime(QDate(2010,10,12), QTime(23,59,59)) << true;
+    QTest::newRow("todo - month") << QOrganizerItem(todo) << QDate(2010,10,1).startOfDay() << QDate(2010,10,31).startOfDay() << true;
+    QTest::newRow("todo - first day") << QOrganizerItem(todo) << QDate(2010,10,10).startOfDay() << QDate(2010,10,10).endOfDay() << true;
+    QTest::newRow("todo - second day") << QOrganizerItem(todo) << QDate(2010,10,11).startOfDay() << QDate(2010,10,11).endOfDay() << true;
+    QTest::newRow("todo - last day") << QOrganizerItem(todo) << QDate(2010,10,12).startOfDay() << QDate(2010,10,12).endOfDay() << true;
     QTest::newRow("todo - undefined period") << QOrganizerItem(todo) << QDateTime() << QDateTime() << true;
-    QTest::newRow("todo - undefined start") << QOrganizerItem(todo) << QDateTime() << QDateTime(QDate(2010,10,11)) << true;
-    QTest::newRow("todo - undefined end") << QOrganizerItem(todo) << QDateTime(QDate(2010,10,11)) << QDateTime() << true;
-    QTest::newRow("todo - before") << QOrganizerItem(todo) << QDateTime(QDate(2010,10,8)) << QDateTime(QDate(2010,10,9)) << false;
-    QTest::newRow("todo - after") << QOrganizerItem(todo) << QDateTime(QDate(2010,10,13)) << QDateTime(QDate(2010,10,14)) << false;
+    QTest::newRow("todo - undefined start") << QOrganizerItem(todo) << QDateTime() << QDate(2010,10,11).startOfDay() << true;
+    QTest::newRow("todo - undefined end") << QOrganizerItem(todo) << QDate(2010,10,11).startOfDay() << QDateTime() << true;
+    QTest::newRow("todo - before") << QOrganizerItem(todo) << QDate(2010,10,8).startOfDay() << QDate(2010,10,9).startOfDay() << false;
+    QTest::newRow("todo - after") << QOrganizerItem(todo) << QDate(2010,10,13).startOfDay() << QDate(2010,10,14).startOfDay() << false;
 
     todo.setDueDateTime(QDateTime());
-    QTest::newRow("todo missing due date - undefined start") << QOrganizerItem(todo) << QDateTime() << QDateTime(QDate(2010,10,11)) << true;
-    QTest::newRow("todo missing due date - undefined end") << QOrganizerItem(todo) << QDateTime(QDate(2010,10,10)) << QDateTime() << true;
+    QTest::newRow("todo missing due date - undefined start") << QOrganizerItem(todo) << QDateTime() << QDate(2010,10,11).startOfDay() << true;
+    QTest::newRow("todo missing due date - undefined end") << QOrganizerItem(todo) << QDate(2010,10,10).startOfDay() << QDateTime() << true;
 
     todo.setStartDateTime(QDateTime());
     todo.setDueDateTime(QDateTime(QDate(2010, 10, 12), QTime(11,0,0)));
-    QTest::newRow("todo missing start date - undefined start") << QOrganizerItem(todo) << QDateTime() << QDateTime(QDate(2010,10,13)) << true;
-    QTest::newRow("todo missing start date - undefined end") << QOrganizerItem(todo) << QDateTime(QDate(2010,10,11)) << QDateTime() << true;
+    QTest::newRow("todo missing start date - undefined start") << QOrganizerItem(todo) << QDateTime() << QDate(2010,10,13).startOfDay() << true;
+    QTest::newRow("todo missing start date - undefined end") << QOrganizerItem(todo) << QDate(2010,10,11).startOfDay() << QDateTime() << true;
 
     QOrganizerJournal journal;
     journal.setDateTime(QDateTime(QDate(2010, 10, 10), QTime(10,0,0)));
-    QTest::newRow("journal - month") << QOrganizerItem(journal) << QDateTime(QDate(2010,10,1)) << QDateTime(QDate(2010,10,31)) << true;
-    QTest::newRow("journal - first day") << QOrganizerItem(journal) << QDateTime(QDate(2010,10,10)) << QDateTime(QDate(2010,10,10), QTime(23,59,59)) << true;
-    QTest::newRow("journal - second day") << QOrganizerItem(journal) << QDateTime(QDate(2010,10,11)) << QDateTime(QDate(2010,10,11), QTime(23,59,59)) << false;
+    QTest::newRow("journal - month") << QOrganizerItem(journal) << QDate(2010,10,1).startOfDay() << QDate(2010,10,31).startOfDay() << true;
+    QTest::newRow("journal - first day") << QOrganizerItem(journal) << QDate(2010,10,10).startOfDay() << QDate(2010,10,10).endOfDay() << true;
+    QTest::newRow("journal - second day") << QOrganizerItem(journal) << QDate(2010,10,11).startOfDay() << QDate(2010,10,11).endOfDay() << false;
     QTest::newRow("journal - undefined period") << QOrganizerItem(journal) << QDateTime() << QDateTime() << true;
-    QTest::newRow("journal - undefined start") << QOrganizerItem(journal) << QDateTime() << QDateTime(QDate(2010,10,11)) << true;
-    QTest::newRow("journal - undefined end") << QOrganizerItem(journal) << QDateTime(QDate(2010,10,10)) << QDateTime() << true;
-    QTest::newRow("journal - before") << QOrganizerItem(journal) << QDateTime(QDate(2010,10,8)) << QDateTime(QDate(2010,10,9)) << false;
-    QTest::newRow("journal - after") << QOrganizerItem(journal) << QDateTime(QDate(2010,10,13)) << QDateTime(QDate(2010,10,14)) << false;
+    QTest::newRow("journal - undefined start") << QOrganizerItem(journal) << QDateTime() << QDate(2010,10,11).startOfDay() << true;
+    QTest::newRow("journal - undefined end") << QOrganizerItem(journal) << QDate(2010,10,10).startOfDay() << QDateTime() << true;
+    QTest::newRow("journal - before") << QOrganizerItem(journal) << QDate(2010,10,8).startOfDay() << QDate(2010,10,9).startOfDay() << false;
+    QTest::newRow("journal - after") << QOrganizerItem(journal) << QDate(2010,10,13).startOfDay() << QDate(2010,10,14).startOfDay() << false;
 
     QOrganizerNote note;
-    QTest::newRow("note") << QOrganizerItem(note) << QDateTime(QDate(2010,10,1)) << QDateTime() << false;
+    QTest::newRow("note") << QOrganizerItem(note) << QDate(2010,10,1).startOfDay() << QDateTime() << false;
     QTest::newRow("note - undefined period") << QOrganizerItem(note) << QDateTime() << QDateTime() << true;
 }
 
diff --git a/tests/auto/versitorganizer/qversitorganizerimporter/tst_qversitorganizerimporter.cpp b/tests/auto/versitorganizer/qversitorganizerimporter/tst_qversitorganizerimporter.cpp
index 5956607c4..5d7b9bd6d 100644
--- a/tests/auto/versitorganizer/qversitorganizerimporter/tst_qversitorganizerimporter.cpp
+++ b/tests/auto/versitorganizer/qversitorganizerimporter/tst_qversitorganizerimporter.cpp
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2017 The Qt Company Ltd.
+** Copyright (C) 2020 The Qt Company Ltd.
 ** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the test suite of the Qt Toolkit.
@@ -803,8 +803,8 @@ void tst_QVersitOrganizerImporter::testImportEventProperties_data()
         QOrganizerEventTime etr;
         // The time portion must be valid but is ignored.  This test cheats a bit because it knows
         // the implementation sets it to 00:00:00
-        etr.setStartDateTime(QDateTime(QDate(2010, 1, 2), QTime(0, 0, 0)));
-        etr.setEndDateTime(QDateTime(QDate(2010, 1, 2), QTime(0, 0, 0)));
+        etr.setStartDateTime(QDate(2010, 1, 2).startOfDay());
+        etr.setEndDateTime(QDate(2010, 1, 2).startOfDay());
         etr.setAllDay(true);
         QTest::newRow("all day event") << properties
             << (QList<QOrganizerItemDetail>() << etr);
@@ -819,7 +819,7 @@ void tst_QVersitOrganizerImporter::testImportEventProperties_data()
         duration.setName(QStringLiteral("DURATION"));
         duration.setValue(QStringLiteral("P15DT5H7M20S"));
         QOrganizerEventTime etr;
-        etr.setStartDateTime(QDateTime(QDate(2009, 12, 31), QTime(0, 0, 0)));
+        etr.setStartDateTime(QDate(2009, 12, 31).startOfDay());
         etr.setEndDateTime(QDateTime(QDate(2010, 1, 15), QTime(5, 7, 20)));
         QTest::newRow("dtstart and duration: days hours minutes seconds")
             << (QList<QVersitProperty>() << dtstart << duration)
@@ -859,13 +859,13 @@ void tst_QVersitOrganizerImporter::testImportEventProperties_data()
             << (QList<QOrganizerItemDetail>() << etr);
 
         duration.setValue(QStringLiteral("P15D"));
-        etr.setEndDateTime(QDateTime(QDate(2010, 1, 15), QTime(0, 0, 0)));
+        etr.setEndDateTime(QDate(2010, 1, 15).startOfDay());
         QTest::newRow("dtstart and duration: days")
             << (QList<QVersitProperty>() << dtstart << duration)
             << (QList<QOrganizerItemDetail>() << etr);
 
         duration.setValue(QStringLiteral("P7W"));
-        etr.setEndDateTime(QDateTime(QDate(2010, 2, 18), QTime(0, 0, 0)));
+        etr.setEndDateTime(QDate(2010, 2, 18).startOfDay());
         QTest::newRow("dtstart and duration: weeks")
             << (QList<QVersitProperty>() << dtstart << duration)
             << (QList<QOrganizerItemDetail>() << etr);
@@ -873,7 +873,7 @@ void tst_QVersitOrganizerImporter::testImportEventProperties_data()
         dtstart.setValue(QStringLiteral("20100115T050720"));
         duration.setValue(QStringLiteral("-P15DT5H7M20S"));
         etr.setStartDateTime(QDateTime(QDate(2010, 1, 15), QTime(5, 7, 20)));
-        etr.setEndDateTime(QDateTime(QDate(2009, 12, 31), QTime(0, 0, 0)));
+        etr.setEndDateTime(QDate(2009, 12, 31).startOfDay());
         QTest::newRow("dtstart and duration: negative")
             << (QList<QVersitProperty>() << dtstart << duration)
             << (QList<QOrganizerItemDetail>() << etr);
@@ -1315,8 +1315,8 @@ void tst_QVersitOrganizerImporter::testImportTodoProperties_data()
         QOrganizerTodoTime todoTime;
         // The time portion must be valid but is ignored.  This test cheats a bit because it knows
         // the implementation sets it to 00:00:00
-        todoTime.setStartDateTime(QDateTime(QDate(2010, 1, 2), QTime(0, 0, 0)));
-        todoTime.setDueDateTime(QDateTime(QDate(2010, 1, 3), QTime(0, 0, 0)));
+        todoTime.setStartDateTime(QDate(2010, 1, 2).startOfDay());
+        todoTime.setDueDateTime(QDate(2010, 1, 3).startOfDay());
         todoTime.setAllDay(true);
         QTest::newRow("all day todo") << properties
             << (QList<QOrganizerItemDetail>() << todoTime);