diff options
| author | Chris Adams <chris.adams@qinetic.com.au> | 2020-10-16 16:29:58 +1000 |
|---|---|---|
| committer | Chris Adams <chris.adams@qinetic.com.au> | 2020-11-02 13:19:38 +1000 |
| commit | 28182e4f8bb65225a65c5194bf1526632b3840a5 (patch) | |
| tree | e38f395d43c1d35c31538f6600b08f24bd84d8ee | |
| parent | e38c85ba5c7f4ba1189dc1df0592b53e5e025da4 (diff) | |
Adapt to string-to-datetime conversion behavior change in Qt6
Qt6 now correctly takes into account the timezone specification,
whereas Qt5 did not. See QTBUG-87652 for more information.
Change-Id: I36f1193faf0ffed3310c0436967c4e287e1d9a9c
Reviewed-by: Pekka Vuorela <pvuorela@iki.fi>
| -rw-r--r-- | tests/auto/organizer/qmlorganizer/testcases/tst_detailfilter.qml | 36 |
1 files changed, 18 insertions, 18 deletions
diff --git a/tests/auto/organizer/qmlorganizer/testcases/tst_detailfilter.qml b/tests/auto/organizer/qmlorganizer/testcases/tst_detailfilter.qml index 33400c17e..c1301db5c 100644 --- a/tests/auto/organizer/qmlorganizer/testcases/tst_detailfilter.qml +++ b/tests/auto/organizer/qmlorganizer/testcases/tst_detailfilter.qml @@ -174,37 +174,37 @@ TestCase { "import QtQuick 2.0\n" + "import QtOrganizer 5.0 \n" + " Event {\n" - + " startDateTime: new Date('2011-10-23T16:42:00')\n" //notice, date-object - + " endDateTime: new Date('2011-10-23T17:42:00')\n" //notice, date-object + + " startDateTime: new Date('2011-10-23T16:42:00Z')\n" //notice, date-object + + " endDateTime: new Date('2011-10-23T17:42:00Z')\n" //notice, date-object + " description: 'for exact filter - EventTime.StartDateTime'\n" + " }", "import QtQuick 2.0\n" + "import QtOrganizer 5.0 \n" + " Event {\n" - + " startDateTime: '2011-09-23T16:42:00'\n" //notice, string to date-object - + " endDateTime: new Date('2011-10-23T21:00:00')\n" + + " startDateTime: '2011-09-23T16:42:00Z'\n" //notice, string to date-object + + " endDateTime: new Date('2011-10-23T21:00:00Z')\n" + " description: 'for exact filter - EventTime.EndDateTime'\n" + " }", "import QtQuick 2.0\n" + "import QtOrganizer 5.0 \n" + " Event {\n" - + " startDateTime: '2011-10-23T15:00:00'\n" - + " endDateTime: '2011-10-23T16:00:00'\n" + + " startDateTime: '2011-10-23T15:00:00Z'\n" + + " endDateTime: '2011-10-23T16:00:00Z'\n" + " allDay: true\n" + " description: 'for exact filter - EventTime.AllDayEvent'\n" + " }", "import QtQuick 2.0\n" + "import QtOrganizer 5.0 \n" + " Event {\n" - + " startDateTime:'2011-10-23T15:00:00'\n" - + " endDateTime: '2011-11-23T16:00:00'\n" + + " startDateTime:'2011-10-23T15:00:00Z'\n" + + " endDateTime: '2011-11-23T16:00:00Z'\n" + " description: 'for exact filter - Description'\n" + " }", "import QtQuick 2.0\n" + "import QtOrganizer 5.0 \n" + " Event {\n" + " startDateTime:'2011-10-23T15:00:00Z'\n" - + " endDateTime: '2011-11-23T16:00:00'\n" + + " endDateTime: '2011-11-23T16:00:00Z'\n" + " displayLabel: 'my displayLabel'\n" + " description: 'for exact filter - DisplayLabel'\n" + " }", @@ -212,7 +212,7 @@ TestCase { + "import QtOrganizer 5.0 \n" + " Event {\n" + " startDateTime:'2011-10-23T15:00:00Z'\n" - + " endDateTime: '2011-11-23T16:00:00'\n" + + " endDateTime: '2011-11-23T16:00:00Z'\n" + " guid: 'my guid'\n" + " description: 'for exact filter - Guid'\n" + " }", @@ -220,7 +220,7 @@ TestCase { + "import QtOrganizer 5.0 \n" + " Event {\n" + " startDateTime:'2011-10-23T15:00:00Z'\n" - + " endDateTime: '2011-11-23T16:00:00'\n" + + " endDateTime: '2011-11-23T16:00:00Z'\n" + " location: 'my location'\n" + " description: 'for exact filter - Location'\n" + " }", @@ -228,7 +228,7 @@ TestCase { + "import QtOrganizer 5.0 \n" + " Event {\n" + " startDateTime:'2011-10-23T15:00:00Z'\n" - + " endDateTime: '2011-11-23T16:00:00'\n" + + " endDateTime: '2011-11-23T16:00:00Z'\n" + " priority: Priority.VeryHigh\n" + " description: 'for exact filter - Priority'\n" + " }", @@ -244,21 +244,21 @@ TestCase { "import QtQuick 2.0\n" + "import QtOrganizer 5.0 \n" + " Todo {\n" - + " startDateTime: new Date('2010-10-23T15:48:00')\n" + + " startDateTime: new Date('2010-10-23T15:48:00Z')\n" + " percentageComplete:89\n" + " description: 'for exact filter - TodoTime.StartDateTime'\n" + " }", "import QtQuick 2.0\n" + "import QtOrganizer 5.0 \n" + " Todo {\n" - + " startDateTime:new Date('2010-10-22T15:47:00')\n" - + " dueDateTime: new Date('2010-10-25T15:49:00')\n" + + " startDateTime:new Date('2010-10-22T15:47:00Z')\n" + + " dueDateTime: new Date('2010-10-25T15:49:00Z')\n" + " description: 'for exact filter - TodoTime.DueDateTime'\n" + " }", "import QtQuick 2.0\n" + "import QtOrganizer 5.0 \n" + " Todo {\n" - + " startDateTime:new Date('2010-10-22T15:50:00')\n" + + " startDateTime:new Date('2010-10-22T15:50:00Z')\n" + " description: 'for exact filter - TodoTime.AllDay'\n" + " allDay: true\n" + " }", @@ -306,7 +306,7 @@ TestCase { + "import QtOrganizer 5.0 \n" + " ExtendedDetail {\n" + " name: 'stringExtDetail'\n" - + " data: new Date('2010-10-25T15:49:00')\n" + + " data: new Date('2010-10-25T15:49:00Z')\n" + " }", isExtDetail: 1 }, @@ -315,7 +315,7 @@ TestCase { + "import QtOrganizer 5.0 \n" + " EventTime {\n" + " startDateTime:'2011-10-23T15:00:00Z'\n" - + " endDateTime: '2011-11-23T16:00:00'\n" + + " endDateTime: '2011-11-23T16:00:00Z'\n" + " }", }, {tag: "non-matching filter, Description", expectedItemsAmount: 0, |