diff options
| author | Mitch Curtis <mitch.curtis@digia.com> | 2014-03-26 11:06:31 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-03-31 17:45:47 +0200 |
| commit | 4f50be8d1885e685ec8df3796e4156eb015affa7 (patch) | |
| tree | 4ade3bf69eadb7f762841d9b601a2fbb4eb69c8d /src/corelib/io/qdatastream.h | |
| parent | bd822bedfea5126b12c32523a68c3a1ac7a8931d (diff) | |
Properly serialize QFont.
Some data was never serialized (styleName, hintingPreference) and
some was incorrectly serialized (styleStrategy). This change also adds
auto tests for every applicable QDataStream version.
[ChangeLog][QtGui][QFont] QFont now serializes its data properly,
without any data loss.
Task-number: QTBUG-22814
Task-number: QTBUG-22946
Change-Id: I34e61b10662b7ad6c57054dacc7e1f522f5b5c5d
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@digia.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 fb8dce0641..3bf90b39a3 100644 --- a/src/corelib/io/qdatastream.h +++ b/src/corelib/io/qdatastream.h @@ -89,7 +89,7 @@ public: Qt_5_1 = 14, Qt_5_2 = 15, Qt_5_3 = Qt_5_2, - Qt_5_4 = Qt_5_3 + Qt_5_4 = 16 #if QT_VERSION >= 0x050500 #error Add the datastream version for this Qt version #endif |