diff options
| author | Simon Hausmann <simon.hausmann@theqtcompany.com> | 2015-05-04 13:16:14 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@theqtcompany.com> | 2015-05-04 13:19:31 +0200 |
| commit | 7f8719e663edae8b08d34cc67cb5000e8402d3d7 (patch) | |
| tree | b098d2c8077a88c2ada577ac874e1416adaf66f7 /src/widgets/kernel | |
| parent | af851c290b7cea22f26bb8c852b0029696469d74 (diff) | |
| parent | eb82959d6688f9e58be4b67670afba3649f1f799 (diff) | |
Merge remote-tracking branch 'origin/5.5' into HEAD
Change-Id: I487a4b7c05687a10c498ac219c31367d4db6fbc0
Diffstat (limited to 'src/widgets/kernel')
| -rw-r--r-- | src/widgets/kernel/qwidget_p.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/widgets/kernel/qwidget_p.h b/src/widgets/kernel/qwidget_p.h index 9425426215..fe65cb19c7 100644 --- a/src/widgets/kernel/qwidget_p.h +++ b/src/widgets/kernel/qwidget_p.h @@ -358,7 +358,7 @@ public: void updateFont(const QFont &); inline void setFont_helper(const QFont &font) { - if (data.fnt == font && data.fnt.resolve() == font.resolve()) + if (data.fnt.resolve() == font.resolve() && data.fnt == font) return; updateFont(font); } |