summaryrefslogtreecommitdiffstats
path: root/tests/auto/gui/text
diff options
context:
space:
mode:
authorDavid Faure <david.faure@kdab.com>2017-01-10 12:04:07 +0100
committerDavid Faure <david.faure@kdab.com>2017-01-11 15:15:36 +0000
commit62882ad2fe3d9f70c876d7a51a5aab4118ce1ba3 (patch)
tree6bc20be4aee44e454992f228288504490d02e4f4 /tests/auto/gui/text
parent8b64f9336255fa17f1b8e5f337d0e79765512150 (diff)
tst_qfont: clear style name in test font
The test failed if qApp->font() had a styleName() set, when testing old serialization formats which didn't serialize it. Change-Id: If0236d354be144b3a990e074a22f796fffb1ed18 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io> Reviewed-by: Konstantin Shegunov <kshegunov@gmail.com>
Diffstat (limited to 'tests/auto/gui/text')
-rw-r--r--tests/auto/gui/text/qfont/tst_qfont.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/tests/auto/gui/text/qfont/tst_qfont.cpp b/tests/auto/gui/text/qfont/tst_qfont.cpp
index a6d8944656..06c0ba0819 100644
--- a/tests/auto/gui/text/qfont/tst_qfont.cpp
+++ b/tests/auto/gui/text/qfont/tst_qfont.cpp
@@ -358,6 +358,8 @@ void tst_QFont::serialize_data()
// Versions <= Qt 2.1 had broken point size serialization,
// so we set an integer point size.
basicFont.setPointSize(9);
+ // Versions <= Qt 5.4 didn't serialize styleName, so clear it
+ basicFont.setStyleName(QString());
QFont font = basicFont;
QTest::newRow("defaultConstructed") << font << QDataStream::Qt_1_0;