← Back to branch summary

~kubuntu-packagers/kubuntu-packaging/qtpim-opensource-src

« back to all changes in this revision

Viewing changes to debian/patches/Does-not-convert-datetime-properties-to-UTC.patch

  • Committer: Timo Jyrinki
  • Date: 2016-04-15 08:18:19 UTC
  • Revision ID: timo.jyrinki@canonical.com-20160415081819-lr7eiwylhxxryq80
* debian/patches/Does-not-convert-datetime-properties-to-UTC.patch:
  - Avoid converting datetime values to UTC. Upstream commit at 
    https://codereview.qt-project.org/#/c/154461/

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/Does-not-convert-datetime-properties-to-UTC.patch
 
1
From 395aad0601f2ee235af85af1eb00e97e270a91de Mon Sep 17 00:00:00 2001
 
2
From: Renato Araujo Oliveira Filho <renato.filho@canonical.com>
 
3
Date: Fri, 1 Apr 2016 17:18:57 -0300
 
4
Subject: [PATCH] Does not convert datetime properties to UTC.
 
5
 
 
6
Avoid convert datetime values to UTC.
 
7
We need to store the value in the original timezone to correct calculate
 
8
the daylight saving values.
 
9
 
 
10
Change-Id: Ic21dec1d7cfda6ce1e70615d9d7574a7fddc445a
 
11
---
 
12
 .../organizer/qdeclarativeorganizeritemdetail.cpp  | 32 +++++++++++-----------
 
13
 1 file changed, 16 insertions(+), 16 deletions(-)
 
14
 
 
15
diff --git a/src/imports/organizer/qdeclarativeorganizeritemdetail.cpp b/src/imports/organizer/qdeclarativeorganizeritemdetail.cpp
 
16
index 40474b4..f39aa03 100644
 
17
--- a/src/imports/organizer/qdeclarativeorganizeritemdetail.cpp
 
18
+++ b/src/imports/organizer/qdeclarativeorganizeritemdetail.cpp
 
19
@@ -236,14 +236,14 @@ bool QDeclarativeOrganizerEventTime::isAllDay()
 
20
 void QDeclarativeOrganizerEventTime::setStartDateTime(const QDateTime &datetime)
 
21
 {
 
22
      if (datetime != startDateTime()) {
 
23
-        m_detail.setValue(QOrganizerEventTime::FieldStartDateTime, datetime.toUTC());
 
24
+        m_detail.setValue(QOrganizerEventTime::FieldStartDateTime, datetime);
 
25
         emit valueChanged();
 
26
      }
 
27
 }
 
28
 
 
29
 QDateTime QDeclarativeOrganizerEventTime::startDateTime() const
 
30
 {
 
31
-    return m_detail.value<QDateTime>(QOrganizerEventTime::FieldStartDateTime).toLocalTime();
 
32
+    return m_detail.value<QDateTime>(QOrganizerEventTime::FieldStartDateTime);
 
33
 }
 
34
 
 
35
 /*!
 
36
@@ -254,14 +254,14 @@ QDateTime QDeclarativeOrganizerEventTime::startDateTime() const
 
37
 void QDeclarativeOrganizerEventTime::setEndDateTime(const QDateTime &datetime)
 
38
 {
 
39
     if (datetime != endDateTime()) {
 
40
-        m_detail.setValue(QOrganizerEventTime::FieldEndDateTime, datetime.toUTC());
 
41
+        m_detail.setValue(QOrganizerEventTime::FieldEndDateTime, datetime);
 
42
         emit valueChanged();
 
43
     }
 
44
 }
 
45
 
 
46
 QDateTime QDeclarativeOrganizerEventTime::endDateTime() const
 
47
 {
 
48
-    return m_detail.value<QDateTime>(QOrganizerEventTime::FieldEndDateTime).toLocalTime();
 
49
+    return m_detail.value<QDateTime>(QOrganizerEventTime::FieldEndDateTime);
 
50
 }
 
51
 
 
52
 
 
53
@@ -1146,14 +1146,14 @@ QDeclarativeOrganizerItemDetail::DetailType QDeclarativeOrganizerItemTimestamp::
 
54
 void QDeclarativeOrganizerItemTimestamp::setCreated(const QDateTime &timestamp)
 
55
 {
 
56
     if (timestamp != created()) {
 
57
-        m_detail.setValue(QOrganizerItemTimestamp::FieldCreated, timestamp.toUTC());
 
58
+        m_detail.setValue(QOrganizerItemTimestamp::FieldCreated, timestamp);
 
59
         emit valueChanged();
 
60
     }
 
61
 }
 
62
 
 
63
 QDateTime QDeclarativeOrganizerItemTimestamp::created() const
 
64
 {
 
65
-    return m_detail.value<QDateTime>(QOrganizerItemTimestamp::FieldCreated).toLocalTime();
 
66
+    return m_detail.value<QDateTime>(QOrganizerItemTimestamp::FieldCreated);
 
67
 }
 
68
 
 
69
 /*!
 
70
@@ -1164,14 +1164,14 @@ QDateTime QDeclarativeOrganizerItemTimestamp::created() const
 
71
 void QDeclarativeOrganizerItemTimestamp::setLastModified(const QDateTime &timestamp)
 
72
 {
 
73
     if (timestamp != lastModified()) {
 
74
-        m_detail.setValue(QOrganizerItemTimestamp::FieldLastModified, timestamp.toUTC());
 
75
+        m_detail.setValue(QOrganizerItemTimestamp::FieldLastModified, timestamp);
 
76
         emit valueChanged();
 
77
     }
 
78
 }
 
79
 
 
80
 QDateTime QDeclarativeOrganizerItemTimestamp::lastModified() const
 
81
 {
 
82
-    return m_detail.value<QDateTime>(QOrganizerItemTimestamp::FieldLastModified).toLocalTime();
 
83
+    return m_detail.value<QDateTime>(QOrganizerItemTimestamp::FieldLastModified);
 
84
 }
 
85
 
 
86
 
 
87
@@ -1277,13 +1277,13 @@ QDeclarativeOrganizerItemDetail::DetailType QDeclarativeOrganizerJournalTime::ty
 
88
 void QDeclarativeOrganizerJournalTime::setEntryDateTime(const QDateTime &datetime)
 
89
 {
 
90
     if (datetime != entryDateTime()) {
 
91
-        m_detail.setValue(QOrganizerJournalTime::FieldEntryDateTime, datetime.toUTC());
 
92
+        m_detail.setValue(QOrganizerJournalTime::FieldEntryDateTime, datetime);
 
93
         emit valueChanged();
 
94
     }
 
95
 }
 
96
 QDateTime QDeclarativeOrganizerJournalTime::entryDateTime() const
 
97
 {
 
98
-    return m_detail.value<QDateTime>(QOrganizerJournalTime::FieldEntryDateTime).toLocalTime();
 
99
+    return m_detail.value<QDateTime>(QOrganizerJournalTime::FieldEntryDateTime);
 
100
 }
 
101
 
 
102
 
 
103
@@ -1352,14 +1352,14 @@ int QDeclarativeOrganizerTodoProgress::percentageComplete() const
 
104
 void QDeclarativeOrganizerTodoProgress::setFinishedDateTime(const QDateTime &datetime)
 
105
 {
 
106
     if (datetime != finishedDateTime()) {
 
107
-        m_detail.setValue(QOrganizerTodoProgress::FieldFinishedDateTime, datetime.toUTC());
 
108
+        m_detail.setValue(QOrganizerTodoProgress::FieldFinishedDateTime, datetime);
 
109
         emit valueChanged();
 
110
     }
 
111
 }
 
112
 
 
113
 QDateTime QDeclarativeOrganizerTodoProgress::finishedDateTime() const
 
114
 {
 
115
-    return m_detail.value<QDateTime>(QOrganizerTodoProgress::FieldFinishedDateTime).toLocalTime();
 
116
+    return m_detail.value<QDateTime>(QOrganizerTodoProgress::FieldFinishedDateTime);
 
117
 }
 
118
 
 
119
 /*!
 
120
@@ -1448,14 +1448,14 @@ bool QDeclarativeOrganizerTodoTime::isAllDay()
 
121
 void QDeclarativeOrganizerTodoTime::setStartDateTime(const QDateTime &datetime)
 
122
 {
 
123
     if (datetime != startDateTime()) {
 
124
-        m_detail.setValue(QOrganizerTodoTime::FieldStartDateTime, datetime.toUTC());
 
125
+        m_detail.setValue(QOrganizerTodoTime::FieldStartDateTime, datetime);
 
126
         emit valueChanged();
 
127
     }
 
128
 }
 
129
 
 
130
 QDateTime QDeclarativeOrganizerTodoTime::startDateTime() const
 
131
 {
 
132
-    return m_detail.value<QDateTime>(QOrganizerTodoTime::FieldStartDateTime).toLocalTime();
 
133
+    return m_detail.value<QDateTime>(QOrganizerTodoTime::FieldStartDateTime);
 
134
 }
 
135
 
 
136
 /*!
 
137
@@ -1466,14 +1466,14 @@ QDateTime QDeclarativeOrganizerTodoTime::startDateTime() const
 
138
 void QDeclarativeOrganizerTodoTime::setDueDateTime(const QDateTime &dateTime)
 
139
 {
 
140
     if (dateTime != dueDateTime()) {
 
141
-        m_detail.setValue(QOrganizerTodoTime::FieldDueDateTime, dateTime.toUTC());
 
142
+        m_detail.setValue(QOrganizerTodoTime::FieldDueDateTime, dateTime);
 
143
         emit valueChanged();
 
144
     }
 
145
 }
 
146
 
 
147
 QDateTime QDeclarativeOrganizerTodoTime::dueDateTime() const
 
148
 {
 
149
-    return m_detail.value<QDateTime>(QOrganizerTodoTime::FieldDueDateTime).toLocalTime();
 
150
+    return m_detail.value<QDateTime>(QOrganizerTodoTime::FieldDueDateTime);
 
151
 }
 
152
 
 
153
 
 
154
-- 
 
155
2.7.4
 
156