From d36a1dfb51af3f981262bc8e8fcd22b91aa890a6 Mon Sep 17 00:00:00 2001 From: Andy Shaw Date: Tue, 1 Sep 2015 03:03:28 +0200 Subject: Serialize the capitalization value of QFont By serializing the capitalization value of QFont, it ensures that it is correctly preserved when QPicture streams it and later plays it back. Subsequently the QDataStream version has been bumped up to account for the change of the data format for serializing QFont. [ChangeLog][QtGui][QFont] QFont now serializes the capitalization setting. [ChangeLog][Important Behavior Changes] QDataStream version bumped up to 17 to account for changes in the serialization of QFont. Task-number: QTBUG-15214 Change-Id: I042680760e5a69d18d41e786b7500a3eebbe562f Reviewed-by: Mitch Curtis --- tests/auto/corelib/io/qdatastream/tst_qdatastream.cpp | 4 +++- tests/auto/gui/text/qfont/tst_qfont.cpp | 5 +++++ 2 files changed, 8 insertions(+), 1 deletion(-) (limited to 'tests/auto') diff --git a/tests/auto/corelib/io/qdatastream/tst_qdatastream.cpp b/tests/auto/corelib/io/qdatastream/tst_qdatastream.cpp index 2cf93e1c45..d9d3f55d4a 100644 --- a/tests/auto/corelib/io/qdatastream/tst_qdatastream.cpp +++ b/tests/auto/corelib/io/qdatastream/tst_qdatastream.cpp @@ -264,7 +264,9 @@ static int NColorRoles[] = { QPalette::ToolTipText + 1, // Qt_5_2 QPalette::ToolTipText + 1, // Qt_5_3 QPalette::ToolTipText + 1, // Qt_5_4 - 0 // add the correct value for Qt_5_5 here later + QPalette::ToolTipText + 1, // Qt_5_5 + QPalette::ToolTipText + 1, // Qt_5_6 + 0 // add the correct value for Qt_5_7 here later }; // Testing get/set functions diff --git a/tests/auto/gui/text/qfont/tst_qfont.cpp b/tests/auto/gui/text/qfont/tst_qfont.cpp index 462e5115b4..84109441b9 100644 --- a/tests/auto/gui/text/qfont/tst_qfont.cpp +++ b/tests/auto/gui/text/qfont/tst_qfont.cpp @@ -608,6 +608,11 @@ void tst_QFont::serialize_data() font.setStyleName("Regular Black Condensed"); // This wasn't read until 5.4. QTest::newRow("styleName") << font << QDataStream::Qt_5_4; + + font = basicFont; + font.setCapitalization(QFont::AllUppercase); + // This wasn't read until 5.6. + QTest::newRow("capitalization") << font << QDataStream::Qt_5_6; } void tst_QFont::serialize() -- cgit v1.2.3