diff options
author | Mitch Curtis <mitch.curtis@digia.com> | 2013-04-22 14:28:24 +0200 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-05-08 10:00:29 +0200 |
commit | 83315ce8b2b5c314fef2382f5ef5344de59fe3e3 (patch) | |
tree | ed01fce950309c32d5f7bed6b80199737c1fc3dc /src/corelib/io/qdatastream.h | |
parent | 7e7d40eeb77ee3b4029a8f90c14df6373f082692 (diff) |
Revert QDateTime serialisation to pre-Qt 5 behaviour.
In Qt 5, I managed to break the guarantee that a deserialised local
datetime is the same time of day (potentially different UTC time),
regardless of which timezone it was serialised in. This happened after
I fixed QTBUG-4057 with If650e7960dca7b6ab44b8233410a6369c41df73a,
which serialised datetimes as UTC.
This patch reverts QDateTime serialisation to pre-Qt 5 behaviour to
restore the guarantee and consequently re-opens QTBUG-4057.
Change-Id: Iea877f7ed886f530b928067789b53534e89fe8cb
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'src/corelib/io/qdatastream.h')
-rw-r--r-- | src/corelib/io/qdatastream.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/corelib/io/qdatastream.h b/src/corelib/io/qdatastream.h index 6017ba5e7d..969cdf4517 100644 --- a/src/corelib/io/qdatastream.h +++ b/src/corelib/io/qdatastream.h @@ -86,7 +86,7 @@ public: Qt_4_8 = Qt_4_7, Qt_4_9 = Qt_4_8, Qt_5_0 = 13, - Qt_5_1 = Qt_5_0 + Qt_5_1 = 14 #if QT_VERSION >= 0x050200 #error Add the datastream version for this Qt version #endif |